Piotr Sarnacki a5978dd36f Merge branch 'master' into dashboard ... Conflicts: assets/scripts/app/controllers.coffee assets/scripts/app/routes.coffee		2015-01-19 13:09:30 +01:00
..
guard	add back guard for @svenfuchs	2012-10-16 19:06:08 +02:00
rake-pipeline	Use ENV.FORCE_JQUERY when building for production	2012-10-23 03:47:12 +02:00
travis	Merge branch 'master' into dashboard	2015-01-19 13:09:30 +01:00