Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-26 03:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
tracks/app
History
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
..
assets Merge branch 'master' into new-gui 2014-03-06 10:31:39 +01:00
controllers Merge branch 'master' into new-gui 2014-03-06 10:31:39 +01:00
helpers Merge branch 'master' into new-gui 2014-03-06 10:31:39 +01:00
mailers initial upgrade to rails 3.2.3 2012-04-30 13:56:33 +02:00
models Merge branch 'master' into new-gui 2014-01-07 21:01:55 +01:00
services make todo_from_rich_message time zone aware. test was failing. 2014-01-26 15:05:27 +01:00
views Merge branch 'master' into new-gui 2014-03-06 10:31:39 +01:00