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

Merge branch 'master' into... 

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

# Conflicts:
#	tests/application/modules/admin/controllers/NewsletterControllerTest.php
parents 52b521cd 20cad27b
3 merge requests!2080Sandbox detach zf from storm,!2061Master,!1989Dev#45275 3155 contractuel application nouvelle methode d edition par lot des articles aux collections
Pipeline #246 passed with stage
in 8 minutes and 24 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 274 additions and 39 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