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

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

Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline#54764_probleme_de_filtre_sur_les_bibliotheques_de_chambery

# Conflicts:
#	cosmogramme/sql/patch/patch_317.php
#	tests/db/UpgradeDBTest.php
parents 85284cac afb18bf5
Branches
Tags
5 merge requests!2080Sandbox detach zf from storm,!2061Master,!2024Master,!2023Stable,!2020Hotline#54764 probleme de filtre sur les bibliotheques de chambery
Pipeline #417 failed with stage
in 20 minutes and 40 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 934 additions and 129 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