travis-web/public/javascripts
Piotr Sarnacki 1134028996 Travis mostly works with new router
I haven't touched almost all of the things related to profile. I'm not
also sure what's the state of authentication at this point.

Conflicts:

	Gemfile
	Gemfile.lock
	Procfile
	assets/javascripts/app/app.coffee
	assets/javascripts/app/controllers.coffee
	assets/javascripts/app/controllers/auth.coffee
	assets/javascripts/app/controllers/profile.coffee
	assets/javascripts/app/routes.coffee
	assets/javascripts/app/templates/builds/list.hbs
	assets/javascripts/app/templates/builds/show.hbs
	assets/javascripts/app/templates/jobs/list.hbs
	assets/javascripts/app/templates/layouts/top.hbs
	assets/javascripts/app/templates/repos/list.hbs
	assets/javascripts/app/templates/repos/show/tabs.hbs
	assets/javascripts/app/templates/workers/list.hbs
	assets/javascripts/app/views.coffee
	assets/javascripts/app/views/repo/show.coffee
	assets/javascripts/travis.coffee
	public/index.html
	public/javascripts/application.js
	public/stylesheets/application.css
2012-09-26 16:30:16 +02:00
..
specs Fix specs and a bug that they've catched 2012-08-12 02:26:45 +02:00
application.js Travis mostly works with new router 2012-09-26 16:30:16 +02:00
vendor.js Update ember and ember-data 2012-09-26 15:07:52 +02:00