tracks/test
Reinier Balt eb1502d4e0 Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
2014-01-07 21:01:55 +01:00
..
controllers Merge branch 'master' into new-gui 2014-01-07 21:01:55 +01:00
fixtures Merge branch 'master' into new-gui 2014-01-07 21:01:55 +01:00
integration move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
models Merge branch 'master' into new-gui 2014-01-07 21:01:55 +01:00
minimal_test_helper.rb move coverage to ci rake task 2013-09-24 09:48:21 +02:00
test_helper.rb move coverage to ci rake task 2013-09-24 09:48:21 +02:00