Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views/finance
History
wvengen f6ba21832d Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/_form.html.haml
	app/views/articles/sync.html.haml
	app/views/finance/balancing/_edit_note.html.haml
	app/views/finance/group_order_articles/_form.html.haml
	app/views/finance/order_articles/_edit.html.haml
	app/views/finance/order_articles/_new.html.haml
	app/views/group_orders/show.html.haml
	app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
..
balancing Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-12 15:45:24 +02:00
financial_transactions move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
group_order_articles Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-12 15:45:24 +02:00
invoices move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
order_articles Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-12 15:45:24 +02:00
ordergroups i18n finance ordergroups 2013-02-11 10:21:39 +07:00
index.html.haml move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00