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

Merge remote-tracking branch 'refs/remotes/origin/master' into...

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64573_amelioration_de_la_charte_modele

Conflicts:
	library/Class/Systeme/Widget/Abstract.php
parents e4b54a41 86e16a8f
Branches
Tags
6 merge requests!2767Hotline,!2742Dev#64573 amelioration de la charte modele,!2724Dev#64573 amelioration de la charte modele,!2718Dev#64573 amelioration de la charte modele,!2679Dev#64573 amelioration de la charte modele,!2439WIP Dev#64573 amelioration de la charte modele
Pipeline #3371 passed with stage
in 28 minutes and 41 seconds
Showing
with 429 additions and 102 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