wvengen 6c0de3dc74 Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update' ... Conflicts: config/locales/de.yml config/locales/en.yml		2014-01-20 12:12:00 +01:00
..
assets	Merge pull request #222 from wvengen/feature-receive	2014-01-20 03:02:27 -08:00
controllers	i18n update	2014-01-13 23:23:37 +01:00
documents	i18n simple_form move of fax pdf	2013-10-09 23:41:15 +02:00
helpers	make receive delta work when unit_quantity changes	2014-01-13 11:37:18 +01:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	user display changes in model and mailer	2013-09-22 14:38:56 +02:00
models	Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'	2014-01-20 12:12:00 +01:00
views	Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'	2014-01-20 12:12:00 +01:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00