Sven Fuchs 6e7382ed05 Merge branch 'master' of github.com:travis-ci/travis-web ... Conflicts: Gemfile.lock public/scripts/app.js public/scripts/min/app.js public/styles/app.css public/version		2012-10-09 15:25:27 +02:00
..
min	Merge branch 'master' of github.com:travis-ci/travis-web	2012-10-09 15:25:27 +02:00
app.js	Merge branch 'master' of github.com:travis-ci/travis-web	2012-10-09 15:25:27 +02:00
app.min.js	rework the asset pipeline to use environments	2012-10-06 15:28:11 +02:00