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
..
de	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-04-12 15:45:24 +02:00
en	update en translation	2013-04-12 01:30:02 +02:00