Julian Lam be30dcc2d0 Merge branch 'master' into 0.7.0 ...

Conflicts:
	public/src/client/groups/list.js

2015-01-21 17:16:06 -05:00

..

images

default cover photo for groups, #2588

2015-01-12 21:14:00 -05:00

language

if you attempt to join a group when you're already in a group, you can't anymore.

2015-01-16 20:14:39 -05:00

less

added icon container styles back to ACP, proper hooking-up of iconSelect module in group settings panel, #2588

2015-01-11 17:44:51 -05:00

src

Merge branch 'master' into 0.7.0

2015-01-21 17:16:06 -05:00

uploads

gitignore and folders

2014-10-08 13:48:50 -04:00

vendor

cover photo for groups, #2588

2015-01-12 20:34:15 -05:00

favicon.ico

added favicon

2013-06-28 15:56:44 -04:00

logo.png

default link tag (apple-touch-icon) added

2013-11-26 11:34:38 -05:00