Skip to content
Snippets Groups Projects
Commit 3be9bc14 authored by Laurent's avatar Laurent
Browse files

Merge branch 'origin-SPRINT3_DEV_#13296_formation_widget'

Conflicts:
	library/startup.php
parents 41432f21 bd4c8add
Branches
Tags
3 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!180Master,!125Master
Showing
with 488 additions and 167 deletions
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