foodsoft/config/locales
wvengen b30b424540 Merge branch 'master' into feature-receive
Conflicts:
	app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +01:00
..
de.yml Merge branch 'master' into feature-receive 2014-01-09 18:42:29 +01:00
en.yml Merge branch 'master' into feature-receive 2014-01-09 18:42:29 +01:00
fr.yml Clean up OrderArticle#new form and related stuff 2014-01-02 19:14:46 +01:00
nl.yml Clean up OrderArticle#new form and related stuff 2014-01-02 19:14:46 +01:00
overrides.yml use rails-i18n translations 2013-10-17 16:43:14 +02:00