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
..
assets	Remove strip_debug	2015-01-15 12:39:05 +01:00
web	Use already existing mechanism for assets_host	2015-01-19 11:36:56 +01:00
assets.rb	Add ordering to dashboard stylesheets	2015-01-15 13:08:50 +01:00
web.rb	travis-web does not use travis-core	2014-10-13 14:47:32 +02:00