Alexander Belanger bd04ab2e39 increase timeout and fix merge conflicts %!s(int64=4) %!d(string=hai) anos
..
ci bd04ab2e39 increase timeout and fix merge conflicts %!s(int64=4) %!d(string=hai) anos
email e902ef8645 handle password reset for github users %!s(int64=5) %!d(string=hai) anos