Julian Lam 7bbc630dfb Merge remote-tracking branch 'origin' into thread_options ...

Conflicts:
	public/src/templates.js

2013-05-07 12:56:21 -04:00

..

ajaxify.js

Merge remote-tracking branch 'origin' into thread_options

2013-05-07 12:56:21 -04:00

app.js

fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies

2013-05-06 22:05:42 +00:00

templates.js

finished recent, popular and active posts shells, just need to update api methods

2013-05-07 16:52:35 +00:00