tracks/test
Reinier Balt 4a485558e2 Merge branch 'master' into rails4
Conflicts:
	Gemfile.lock
	config/routes.rb
2013-06-17 09:25:02 +02:00
..
controllers Merge branch 'master' into rails4 2013-06-17 09:25:02 +02:00
fixtures add state machine to context including a closed state 2013-03-01 16:22:29 +01:00
integration move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
models Merge branch 'master' into rails4 2013-06-17 09:25:02 +02:00
minimal_test_helper.rb add the mocha stubbing and mocking library 2013-03-03 13:56:18 -06:00
test_helper.rb remove using minimal_test_helper from test_helper. 2013-05-13 12:10:41 +02:00