wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214) ... Conflicts: Gemfile.lock		2014-02-24 12:46:28 +01:00
..
base_controller.rb	migrate to Rails 4.0 (closes foodcoops#214)	2014-02-24 12:46:28 +01:00
ordergroups_controller.rb	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
users_controller.rb	make search work without nickname usage	2013-09-20 23:18:06 +02:00
workgroups_controller.rb	migrate to Rails 4.0 (closes foodcoops#214)	2014-02-24 12:46:28 +01:00