Julian Lam 72ef8c839f Merge remote-tracking branch 'origin/master' into category-whitelisting ...

Conflicts:
	src/groups.js

2013-11-27 11:34:52 -05:00

..

images/themes

minor tweaks to theme engine

2013-07-23 16:43:02 -04:00

language

show admin link in header if user is admin, closes #459

2013-10-28 15:49:12 -04:00

src

category read restrictions

2013-11-27 08:49:23 -05:00

templates

topics - added back social sharing buttons to OP

2013-11-27 10:58:37 -05:00

uploads

removing debug statements from ajaxify

2013-05-15 12:04:30 -04:00

vendor

fontawesome 4 migration, closes #473

2013-11-26 14:25:46 -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