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

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

Conflicts:
	cosmogramme/sql/patch/patch_337.php
	tests/db/UpgradeDBTest.php
parents 8109a04f 705ed9f0
Branches
Tags
2 merge requests!2397Master,!2396Hotline master
Pipeline #2850 passed with stage
in 22 minutes and 15 seconds
Showing
with 717 additions and 27 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