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

Merge branch 'hotline-master' into...

Merge branch 'hotline-master' into origin-dev#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections

# Conflicts:
#	application/modules/opac/views/scripts/formations/index.phtml
parents 4f38dcd2 9fe2d614
Branches
Tags
4 merge requests!2080Sandbox detach zf from storm,!2061Master,!1989Dev#45275 3155 contractuel application nouvelle methode d edition par lot des articles aux collections,!1959Dev#45275 3155 contractuel application nouvelle methode d edition par lot des articles aux collections
Pipeline #200 passed with stage
in 8 minutes and 8 seconds
Showing
with 213 additions and 146 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