Alexander Belanger a1956e9782 fix merge conflicts 4 éve
..
token.go a1956e9782 fix merge conflicts 4 éve
token_test.go 26c7559c06 get tests to work again 4 éve