wvengen 60826ceedc allow to edit GroupOrderArticle result from orders screen ... Conflicts: app/assets/javascripts/application.js		2014-02-10 16:03:08 +01:00
..
de.yml	cleanup articles sorted in groups	2014-02-10 15:58:58 +01:00
en.yml	allow to edit GroupOrderArticle result from orders screen	2014-02-10 16:03:08 +01:00
fr.yml	localeapp roundtrip	2014-01-20 12:59:57 +01:00
nl.yml	add Dutch translation texts	2014-01-20 13:30:14 +01:00
overrides.yml	use rails-i18n translations	2013-10-17 16:43:14 +02:00