Sven Fuchs 52bdbf5468 Merge branch 'master' of github.com:travis-ci/travis-web ... Conflicts: public/scripts/app.js public/scripts/min/app.js public/styles/app.css public/version script/server		2012-10-18 03:55:17 +02:00
..
app.rb	Merge branch 'master' of github.com:travis-ci/travis-web	2012-10-18 03:55:17 +02:00