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
..
de.yml	Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup	2013-12-17 15:58:47 +01:00
en.yml	Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup	2013-12-17 15:58:47 +01:00
fr.yml	Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup	2013-12-17 15:58:47 +01:00
nl.yml	Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup	2013-12-17 15:58:47 +01:00
overrides.yml	use rails-i18n translations	2013-10-17 16:43:14 +02:00