Jason Smale 63c461e86b Merge branch 'master' into 142-ShowPrTitle ... Conflicts: assets/scripts/app/templates/builds/show.hbs		2013-03-18 09:43:29 +11:00
..
app	Merge branch 'master' into 142-ShowPrTitle	2013-03-18 09:43:29 +11:00
config	We can remove locales.js, it will be created on compilation on heroku	2012-12-17 22:17:04 +01:00
data	Add BusyConf as sponsor.	2013-03-14 17:36:55 +01:00
lib	Add ChunkBuffer to log	2013-03-13 00:13:51 +01:00
spec	Fix specs	2013-03-14 19:59:20 +01:00
vendor	Update ember.js	2013-03-14 15:43:12 +01:00
travis.coffee	Merge branch 'master' into ps-ember-update	2013-03-09 12:48:35 +01:00