Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/lib/foodsoft_wiki/app
History
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
..
controllers move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
helpers move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
models move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
views/pages Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00