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
..
assets	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
controllers	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-04-12 15:45:24 +02:00
documents	finish documents i18n	2013-04-04 02:04:31 +02:00
helpers	use more beautiful close mark	2013-04-10 17:34:24 +02:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	Set host infos for urls in emails via app_config.	2012-12-28 13:55:18 +01:00
models	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-04-12 15:45:24 +02:00
views	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-04-12 15:45:24 +02:00
workers	Replaced delayed_job with resque. See README_DEVEL	2012-12-23 17:38:04 +01:00