wvengen 94b2c8eac3 Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup ... Conflicts: app/views/deliveries/_stock_article_form.html.haml config/locales/de.yml config/locales/en.yml		2013-12-17 15:58:47 +01:00
..
assets	Merge pull request #218 from foodcoop-adam/article-dialog	2013-12-17 06:29:04 -08:00
controllers	Apply publish/subscribe pattern to stock_article manipulation in delivery form	2013-12-07 16:42:25 +01:00
documents	i18n simple_form move of fax pdf	2013-10-09 23:41:15 +02:00
helpers	Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch	2013-12-17 06:28:25 -08: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 'foodcoops/master' into feature-i18n-cleanup	2013-12-17 15:58:47 +01:00
views	Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup	2013-12-17 15:58:47 +01:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00