wvengen c37ed74942 Merge branch 'master' into allow-no-nickname ... Conflicts: app/views/foodcoop/users/_users.html.haml		2013-10-29 19:15:52 +01:00
..
_form.html.haml	Merge branch 'master' into allow-no-nickname	2013-10-29 19:15:52 +01:00
_orders.html.haml	finish group_orders i18n + controller	2013-02-09 02:01:31 +01:00
_switch_order.html.haml	finish group_orders i18n + controller	2013-02-09 02:01:31 +01:00
archive.html.haml	finish group_orders i18n + controller	2013-02-09 02:01:31 +01:00
archive.js.haml	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
edit.html.haml	Big feactoring and bug fixing, Mailer, Tasks, GroupOrders	2012-08-24 11:11:40 +02:00
index.html.haml	finish group_orders i18n + controller	2013-02-09 02:01:31 +01:00
new.html.haml	Big feactoring and bug fixing, Mailer, Tasks, GroupOrders	2012-08-24 11:11:40 +02:00
order.html.haml	finish group_orders i18n + controller	2013-02-09 02:01:31 +01:00
show.html.haml	start of making nickname optional	2013-09-20 22:40:13 +02:00