foodsoft/lib/foodsoft_wiki/app/views/pages
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
..
_body.html.haml move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
_form.html.haml move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
_page_list_item.html.haml Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
_recent_changes.html.haml move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
_site_map.html.haml move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
_title_list.html.haml move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
all.html.haml move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
edit.html.haml move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
new.html.haml move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
show.html.haml Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
version.html.haml Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00