wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214) ... Conflicts: Gemfile.lock		2014-02-24 12:46:28 +01:00
..
locales	copy wiki strings to plugin area	2013-11-19 18:33:54 +01:00
routes.rb	migrate to Rails 4.0 (closes foodcoops#214)	2014-02-24 12:46:28 +01:00