Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
679 commits 22 branches 1 tag 31 MiB
Commit graph

3 commits

Author SHA1 Message Date
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
wvengen
734179a2bd clarify group_orders i18n 2013-02-12 00:06:23 +01:00
wvengen
8d899581bd finish group_orders i18n + controller 2013-02-09 02:01:31 +01:00