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

..

categories.less

ACP: Fix layout for long category description

2015-10-05 22:13:25 +02:00

flags.less

closes #2132

2014-10-07 16:21:16 -04:00

groups.less

closes #3741

2015-10-13 19:28:55 -04:00

tags.less

underped tags page

2015-08-20 14:06:41 -04:00

users.less

using fancy new mixin

2015-10-07 06:05:02 -04:00