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
..
de.yml	Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'	2014-01-20 12:12:00 +01:00
en.yml	Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'	2014-01-20 12:12:00 +01:00
fr.yml	Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'	2014-01-20 12:12:00 +01:00
nl.yml	Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'	2014-01-20 12:12:00 +01:00
overrides.yml	use rails-i18n translations	2013-10-17 16:43:14 +02:00