wvengen 2b511ee559 Merge branch 'master' into fresh-flow ... Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less		2013-12-18 17:03:26 +01:00
..
de.yml	localeapp roundtrip [ci skip]	2013-12-17 18:54:05 +01:00
en.yml	Merge branch 'master' into fresh-flow	2013-12-18 17:03:26 +01:00
fr.yml	localeapp roundtrip [ci skip]	2013-12-17 18:54:05 +01:00
nl.yml	localeapp roundtrip [ci skip]	2013-12-17 18:54:05 +01:00
overrides.yml	use rails-i18n translations	2013-10-17 16:43:14 +02:00