Sven Fuchs b3c310d51d Merge branch 'sf-auth-iframe' of github.com:travis-ci/travis-ember into sf-auth-iframe ... Conflicts: public/stylesheets/application.css		2012-09-18 20:31:24 +02:00
..
application.css	Merge branch 'sf-auth-iframe' of github.com:travis-ci/travis-ember into sf-auth-iframe	2012-09-18 20:31:24 +02:00
jasmine.css	try using jasmine for specs	2012-06-25 23:58:27 +02:00