Olivier PEREZ a055c6d739 Merge branch 'master' into develop		2016-03-23 22:57:04 +01:00
..
de.json	Merge branch 'Fix/119-Translations-change' into 'develop'	2016-03-23 22:40:14 +01:00
en.json	Merge branch 'Fix/119-Translations-change' into 'develop'	2016-03-23 22:40:14 +01:00
es.json	Merge branch 'master' into develop	2016-03-23 22:57:04 +01:00
fr.json	Merge branch 'master' into develop	2016-03-23 22:57:04 +01:00
it.json	Merge branch 'Fix/119-Translations-change' into 'develop'	2016-03-23 22:40:14 +01:00
oc.json	Merge branch 'master' into develop	2016-03-23 22:57:04 +01:00