tracks/app/models
Reinier Balt 4a485558e2 Merge branch 'master' into rails4
Conflicts:
	Gemfile.lock
	config/routes.rb
2013-06-17 09:25:02 +02:00
..
stats Fix failing tests 2013-03-18 21:54:19 -06:00
todos Remove more duplication from Todos::Calendar. 2013-04-29 16:35:50 -05:00
.gitkeep initial upgrade to rails 3.2.3 2012-04-30 13:56:33 +02:00
context.rb move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
dependency.rb fix caching for #1328 and #1329 2012-09-19 17:13:29 +02:00
message_gateway.rb fix finding the used in the message_gateway 2013-04-29 09:38:34 +02:00
note.rb move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
preference.rb move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
project.rb move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
recurring_todo.rb Merge branch 'master' into rails4 2013-06-17 09:25:02 +02:00
tag.rb move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
tagging.rb move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
todo.rb Merge branch 'master' into rails4 2013-06-17 09:25:02 +02:00
user.rb move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00