Skip to content
Snippets Groups Projects
Commit 0e372e37 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:
#	public/opac/skins/modele/css/global.css
parents 2b893ef6 0fb7eb88
Branches
Tags
7 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,!2429Dev#64573 amelioration de la charte modele
Pipeline #2436 passed with stage
in 20 minutes and 25 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 206 additions and 16 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