Commit graph

3 commits

Author SHA1 Message Date
wvengen
6aa8ee7968 Move plugins to separate directory. 2014-11-22 00:43:24 +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
Renamed from app/views/pages/version.html.haml (Browse further)