Skip to content
Snippets Groups Projects
Commit f1083d3c authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branches 'b14' and 'master' of https://git.unicaen.fr/open-source/OSE 

 Conflicts:
	CHANGELOG.md
	admin/actions/help.php
	data/ddl/package/UNICAEN_TBL/body.sql
	module/Application/src/Application/Controller/ContratController.php
	module/Application/src/Application/Controller/StatutIntervenantController.php
	module/Application/src/Application/Form/StatutIntervenant/StatutIntervenantSaisieForm.php
	module/Application/src/Application/Processus/PlafondProcessus.php
	module/Application/src/Application/View/Helper/Service/Liste.php
parents 50ad117d fdf31e67
No related branches found
No related tags found
1 merge request!55Ll bug report services
Show whitespace changes
Inline Side-by-side
Showing
with 368 additions and 83 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment