Benjamin Meichsner 93f4239db6 Fixed wrong articles total in group_order#show. ... Conflicts: app/views/group_orders/show.html.haml		2013-04-10 10:54:56 +02:00
..
assets	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
controllers	finish article_categories controllers i18n + translation	2013-04-04 02:10:52 +02:00
documents	finish documents i18n	2013-04-04 02:04:31 +02:00
helpers	Only show undeleted articles in delivery/stock_taking forms.	2013-03-23 18:25:54 +01: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	Allow article price equal to zero. Closes #111	2013-04-10 10:51:36 +02:00
views	Fixed wrong articles total in group_order#show.	2013-04-10 10:54:56 +02:00
workers	Replaced delayed_job with resque. See README_DEVEL	2012-12-23 17:38:04 +01:00