wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 ... Conflicts: app/controllers/admin/ordergroups_controller.rb app/controllers/finance/balancing_controller.rb app/controllers/suppliers_controller.rb app/views/articles/_article.html.haml app/views/finance/balancing/_summary.haml app/views/finance/balancing/new.html.haml app/views/group_orders/_form.html.haml app/views/home/_apple_bar.html.haml app/views/suppliers/index.haml		2013-03-21 22:08:09 +01:00
..
de	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
en	finish finance/order_articles i18n + en translation	2013-03-08 23:35:50 +01:00