tracks/app/views/layouts
Reinier Balt 899df1ef8f Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/tracks.css.scss
	app/controllers/todos_controller.rb
	app/services/rich_message_extractor.rb
	app/services/todo_from_rich_message.rb
	app/views/todos/all_done.html.erb
	config/initializers/rack-mini-profiler.rb
	test/models/rich_message_extractor_test.rb
	test/models/todo_from_rich_message_test.rb
2014-03-06 10:31:39 +01:00
..
application.html.erb fix count in navbar and fix tickler 2013-08-24 22:11:52 +02:00
application.old.html.erb remove old assets and archive layout files 2013-06-21 09:02:25 +02:00
login.html.erb add navigation to application layout 2013-06-22 13:48:06 +02:00
login.old.html.erb remove old assets and archive layout files 2013-06-21 09:02:25 +02:00
mobile.m.erb Added possibility to add tracks as webapp on chrome mobile. 2014-02-17 13:38:49 +01:00