Skip to content
Snippets Groups Projects
Patrick Barroca's avatar
Patrick Barroca authored
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#70388_planif_contractuel_minsoc__formulaire_gerer_le_rendu_cote_back

Conflicts:
	library/Class/AdminVar.php
5bf618d9