Antonin 0505ab6bb2 Merge remote-tracking branch 'upstream/develop' into develop ... Conflicts: app/classes/Framadate/Utils.php		2015-04-13 16:16:02 +02:00
..
classes/Framadate	Merge remote-tracking branch 'upstream/develop' into develop	2015-04-13 16:16:02 +02:00
inc	Merge remote-tracking branch 'upstream/develop' into develop	2015-04-13 16:16:02 +02:00