wvengen cb3e2f7ca0 Merge branch 'master' into feature-receive ... Conflicts: config/locales/de.yml		2014-01-11 15:56:33 +01:00
..
de.yml	Merge branch 'master' into feature-receive	2014-01-11 15:56:33 +01:00
en.yml	Merge branch 'master' into feature-receive	2014-01-11 15:56:33 +01:00
fr.yml	Merge branch 'master' into feature-receive	2014-01-11 15:56:33 +01:00
nl.yml	Merge branch 'master' into feature-receive	2014-01-11 15:56:33 +01:00
overrides.yml	use rails-i18n translations	2013-10-17 16:43:14 +02:00