Riley Davis e63e1f3428 Merge branch 'master' ...

Conflicts:
	errors.js
	test/routes/api/auth/index.js

2017-01-31 12:05:16 -07:00

..

asset.js

Open Stream and Closed Stream status

2017-01-26 10:45:50 -03:00

assets.js

add a newline so lint doesn't complain

2016-12-15 15:20:50 -07:00

auth.js

resend verify email

2017-01-31 12:04:19 -07:00

config.js

Notifications

2016-12-06 14:09:36 -03:00

user.js

Clean user state on logout. Allow flagging only if not banned.

2017-01-05 15:34:27 -03:00