foodsoft/app/views/group_orders
wvengen 34a4951e28 Merge branch 'master' into i18n
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
2013-10-09 23:57:43 +02:00
..
_form.html.haml Merge branch 'master' into i18n 2013-10-09 23:57:43 +02: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 Fixed wrong articles total in group_order#show. 2013-04-10 10:54:56 +02:00