foodsoft/config/locales
wvengen 98e7189d31 Merge branch 'master' into i18n
Conflicts:
	app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
..
de.yml use rails-i18n translations 2013-10-17 16:43:14 +02:00
en.yml use rails-i18n translations 2013-10-17 16:43:14 +02:00
fr.yml Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
nl.yml Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
overrides.yml use rails-i18n translations 2013-10-17 16:43:14 +02:00