psychobunny 85aa587749 merge conflicts

2013-11-28 17:16:27 -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

merge conflicts

2013-11-28 17:16:27 -05:00

templates

templates bugfix - now supports multiple conditionals of the same variable; added data-favourited button and deprecated reliance on BS3

2013-11-28 17:14:04 -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