4 commits

Author	SHA1	Message	Date
wvengen	7841245795	migrate to Rails 4.0 (closes foodcoops#214) ... Conflicts: Gemfile.lock	2014-02-24 12:46:28 +01:00
Manuel Wiedenmann	0d0ff90a64	adds an RSS feed for pages/all	2014-01-04 20:12:01 +01:00
wvengen	66ac3be81f	Merge branch 'master' into allow-no-nickname ... Conflicts: app/views/home/ordergroup.html.haml app/views/login/new_password.html.haml app/views/shared/_auto_complete_users.rhtml app/views/shared/memberships/_current_members.rhtml app/views/shared/memberships/_non_members.rhtml	2013-11-18 11:42:49 +01:00
wvengen	70c12b7c1f	move wiki functionality to plugin	2013-10-29 22:42:06 +01:00