Skip to content
Snippets Groups Projects
Commit 9ba0ad3d authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'refs/remotes/origin/dev#56034_3455contractuel_renommer_module_formation' into origin-WIP

Conflicts:
	library/Class/AdminVar.php
parents e1edf1d6 039995a0
Branches
Tags
2 merge requests!2334Master,!2131Dev#39494 1940 filtres de workflow dans listviewmode
Pipeline #1237 passed with stage
in 13 minutes and 49 seconds
Showing
with 204 additions and 113 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