foodsoft/config/locales
wvengen c37ed74942 Merge branch 'master' into allow-no-nickname
Conflicts:
	app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
..
de.yml localeapp roundtrip [ci skip] 2013-10-23 12:48:19 +02:00
en.yml Merge branch 'master' into allow-no-nickname 2013-10-29 19:15:52 +01:00
fr.yml localeapp roundtrip [ci skip] 2013-10-23 12:48:19 +02:00
nl.yml localeapp roundtrip [ci skip] 2013-10-23 12:48:19 +02:00
overrides.yml use rails-i18n translations 2013-10-17 16:43:14 +02:00