tracks/app/assets
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
..
images remove executable modes from these image files 2013-09-05 10:39:06 +02:00
javascripts * Add details popover to action. 2013-08-09 22:49:57 +02:00
stylesheets Merge branch 'master' into new-gui 2014-03-06 10:31:39 +01:00
swfs add swf to asset pipeline. Fixes #1311 2012-07-16 17:38:44 +02:00