foodsoft/config/locales
wvengen 8db516c5f0 Merge branch 'master' into feature-cleaner_order_details
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
2014-01-20 13:36:46 +01:00
..
de.yml localeapp roundtrip 2014-01-20 12:59:57 +01:00
en.yml Merge branch 'master' into feature-cleaner_order_details 2014-01-20 13:36:46 +01:00
fr.yml localeapp roundtrip 2014-01-20 12:59:57 +01:00
nl.yml add Dutch translation texts 2014-01-20 13:30:14 +01:00
overrides.yml use rails-i18n translations 2013-10-17 16:43:14 +02:00