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

Merge branch 'origin-master' into...

Merge branch 'origin-master' into dev#64573_templates_pour_l_interface_publique_libraire_bootstrap_v55

Conflicts:
	tests/library/Class/WebService/LastfmTest.php
	tests/library/ZendAfi/View/Helper/Abonne/AbonnementTest.php
parents df2dd5a4 29a27ba8
Branches
Tags
2 merge requests!3297WIP: Master,!3215bootstrap
Pipeline #8327 passed with stage
in 38 minutes and 35 seconds
Showing
with 567 additions and 10 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