2 Commits

Author	SHA1	Message	Date
Calen Pennington	8a89309338	Merge branch 'master' into asset-pipeline ... Conflicts: static/js/application.js	2012-05-21 14:53:16 -04:00
Calen Pennington	6b15303d89	Make collectstatic compile .coffee files, and preserve the askbot workflow using guard	2012-05-18 15:10:10 -04:00