tracks/config
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
..
environments update configs for rails 4 2013-05-11 23:12:20 +02:00
initializers fix regressions 2014-01-11 14:33:14 +01:00
locales Merge branch 'master' into new-gui 2014-03-06 10:31:39 +01:00
application.rb Merge branch 'master' into new-gui 2014-01-07 21:01:55 +01:00
boot.rb update configs for rails 4 2013-05-11 23:12:20 +02:00
cucumber.yml set default format to progress for cucumber 2012-12-26 16:46:05 +01:00
database.yml.tmpl Use mysql for all databases in the template file 2012-10-09 12:22:07 -05:00
environment.rb update configs for rails 4 2013-05-11 23:12:20 +02:00
routes.rb Merge branch 'master' into new-gui 2013-09-22 10:30:24 +02:00
site.yml.tmpl Add Mailgun endpoint for receiving email tasks via Mailgun 2013-09-21 12:43:22 +01:00