Maxime Quandalle 7a5f030cc8 Merge branch 'xavierpriour-devel' into devel ... Conflicts: models/import.js		2015-10-20 20:06:26 +02:00
..
components	Merge branch 'xavierpriour-devel' into devel	2015-10-20 20:06:26 +02:00
config	Translate the label colors	2015-10-15 00:52:32 +02:00
lib	Add some ESLint rules and fix some related issues	2015-10-14 23:50:12 +02:00