date.chapril.org-framadate/app/classes
FramaJosephK 35ba152199 Retouches après série de merges
(cherry picked from commit 6751a8a9cf)

Conflicts:
	adminstuds.php
	app/classes/Framadate/Utils.php
	creation_sondage.php
2015-01-04 18:29:36 +01:00
..
Framadate Retouches après série de merges 2015-01-04 18:29:36 +01:00