Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/config/locales
History
wvengen 34a4951e28 Merge branch 'master' into i18n 
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
2013-10-09 23:57:43 +02:00
..
de.yml Merge branch 'master' into i18n 2013-10-09 23:57:43 +02:00
en.yml Merge branch 'master' into i18n 2013-10-09 23:57:43 +02:00
fr.yml Merge branch 'master' into i18n 2013-10-09 23:57:43 +02:00
nl.yml Merge branch 'master' into i18n 2013-10-09 23:57:43 +02:00