Commit Graph

4 Commits

Author SHA1 Message Date
wvengen 043607f20d workaround wikicloth i18n issue (closes foodsoft#217) 2013-12-06 16:41:16 +01:00
wvengen 9badaca2f3 fix wiki page creation 2013-11-25 16:33:12 +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