Commit graph

2 commits

Author SHA1 Message Date
Reinier Balt
eb1502d4e0 Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
2014-01-07 21:01:55 +01:00
Reinier Balt
0bc9b0397a move tests to new directory 2013-05-11 23:13:16 +02:00
Renamed from test/functional/preferences_controller_test.rb (Browse further)