You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Julian Lam be30dcc2d0 Merge branch 'master' into 0.7.0 ... Conflicts: public/src/client/groups/list.js		10 years ago
..
images	default cover photo for groups, #2588	10 years ago
language	if you attempt to join a group when you're already in a group, you can't anymore.	10 years ago
less	added icon container styles back to ACP, proper hooking-up of iconSelect module in group settings panel, #2588	10 years ago
src	Merge branch 'master' into 0.7.0	10 years ago
uploads	gitignore and folders	11 years ago
vendor	cover photo for groups, #2588	10 years ago
favicon.ico	…
logo.png	…