Piotr Sarnacki 554c8621e3 Merge branch 'master' into ps-ember-update ... Conflicts: Gemfile assets/scripts/travis.coffee		2013-03-09 12:48:35 +01:00
..
app	Merge branch 'master' into ps-ember-update	2013-03-09 12:48:35 +01:00
config	We can remove locales.js, it will be created on compilation on heroku	2012-12-17 22:17:04 +01:00
data	Fix sponsors	2013-02-21 23:22:53 +01:00
lib	Data can be null in ajax request	2013-03-06 14:51:05 +01:00
spec	Increase wait in job_spec	2013-03-07 02:04:51 +01:00
vendor	update log.js	2013-03-09 03:58:50 +01:00
travis.coffee	Merge branch 'master' into ps-ember-update	2013-03-09 12:48:35 +01:00