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

Conflicts:
	public/src/app.js
	public/src/client/account/edit.js

2015-10-07 02:14:03 -04:00

..

images

default cover photo for groups, #2588

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

language

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

2015-10-07 02:14:03 -04:00

less

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

2015-10-07 02:14:03 -04:00

src

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

2015-10-07 02:14:03 -04:00

uploads

added uploads/system

2015-03-07 20:27:23 -05:00

vendor

Update to FontAwesome 4.4.0

2015-09-22 10:43:46 -04: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