psychobunny 3614211f0e Merge remote-tracking branch 'origin/master' into webserver.js-refactor ...

Conflicts:
	public/templates/accountposts.tpl
	public/templates/header.tpl

2014-03-04 17:52:15 -05:00

..

images/themes

minor tweaks to theme engine

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

language

english fallback for 'reset_password' translations

2014-03-04 13:35:20 -05:00

src

Merge remote-tracking branch 'origin/master' into webserver.js-refactor

2014-03-04 17:52:15 -05:00

templates

closes #1141

2014-03-04 16:48:07 -05:00

uploads

removing debug statements from ajaxify

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

vendor

fixed jquery ui package

2014-02-27 15:35:50 -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