Skip to content
Snippets Groups Projects
Commit 35ba1521 authored by FramaJosephK's avatar FramaJosephK Committed by Olivier PEREZ
Browse files

Retouches après série de merges 

(cherry picked from commit 6751a8a9)

Conflicts:
	adminstuds.php
	app/classes/Framadate/Utils.php
	creation_sondage.php
parent 381c4444
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment