date.chapril.org-framadate/locale
Olivier PEREZ 4fa4ee0acc Merge branch 'master' into develop
Conflicts:
	admin/migration.php
2015-10-12 23:46:02 +02:00
..
de.json Merge branch 'master' into develop 2015-10-12 23:46:02 +02:00
en.json Merge branch 'master' into develop 2015-10-12 23:46:02 +02:00
es.json Merge branch 'master' into develop 2015-10-12 23:46:02 +02:00
fr.json Merge branch 'master' into develop 2015-10-12 23:46:02 +02:00
it.json Merge branch 'master' into develop 2015-10-12 23:46:02 +02:00