Julian Lam b52475c270 Merge remote-tracking branch 'origin/master' into user-icons ...

Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl

2015-10-25 07:33:59 -04:00

..

picture.js

Merge remote-tracking branch 'origin/master' into user-icons

2015-10-25 07:33:59 -04:00

profile.js

removed console. log

2015-10-22 17:41:13 -04:00

search.js

socket.io/user.js refactor

2015-09-25 15:56:58 -04:00

status.js

io.in logger

2015-09-25 16:16:07 -04:00