Commit Graph

5 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
03a9be7e78 Add newrelic handler, rather than custom function to log exceptions 2012-05-21 12:12:16 -04:00
Calen Pennington
7dcc6b38ae Moving sass compilation to django-pipeline 2012-04-20 14:20:09 -04:00
David Ormsbee
86b413ff8c fix syslogger errors 2012-04-09 17:17:03 -04:00
David Ormsbee
3a95e3f79f Moving settings2/ folder to envs/ 2012-04-02 14:15:44 -04:00