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

..

database

test fix

2015-06-04 17:14:22 -04:00

mocks

use replicaset if configured

2015-04-25 08:05:33 -07:00

.jshintrc

testing docgen again

2015-02-18 16:19:23 -05:00

categories.js

closes #1917

2015-01-08 13:47:21 -05:00

database.js

jslinting on holiday ftw

2015-01-03 20:07:09 -05:00

groups.js

test

2015-06-02 17:12:46 -04:00

messaging.js

jslinting on holiday ftw

2015-01-03 20:07:09 -05:00

topics.js

jslinting on holiday ftw

2015-01-03 20:07:09 -05:00

user.js

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

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

utils.js

jslinting on holiday ftw

2015-01-03 20:07:09 -05:00