Skip to content
Snippets Groups Projects
Commit a0b1c3aa authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

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

Conflicts:
	cosmogramme/sql/patch/patch_348.php
	tests/db/UpgradeDBTest.php
parents 64bd0912 78f3b5d8
Branches
Tags
No related merge requests found
Pipeline #4589 passed with stage
in 48 minutes and 45 seconds
Showing
with 133 additions and 52 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