Remy Sharp 0f1b36d0a6 Merge branch 'master' into fix/avatar-as-menu-655 ...

Conflicts:
	lib/handlers/bin.js
	lib/models/user.js

2013-07-04 11:25:44 +01:00

..

bin.js

Remove lots of logging.

2013-05-16 14:50:12 +01:00

forgot_token.js

ForgotTokenModel#createToken() returns token

2012-06-24 21:04:53 +01:00

index.js

Pushing in @aron's changes from #190

2012-06-27 16:20:15 +01:00

user.js

Merge branch 'master' into fix/avatar-as-menu-655

2013-07-04 11:25:44 +01:00