Olivier PEREZ 4fa4ee0acc Merge branch 'master' into develop ... Conflicts: admin/migration.php		2015-10-12 23:46:02 +02:00
..
classes/Framadate	Merge branch 'master' into develop	2015-10-12 23:46:02 +02:00
inc	Merge branch 'master' into develop	2015-10-12 23:46:02 +02:00
tests	Write log when send a mail	2015-05-29 17:41:50 +02:00