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

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

# Conflicts:
#	cosmogramme/sql/patch/patch_401.php
#	tests/db/UpgradeDBTest.php
parents 8aef5694 aee71b59
Branches
Tags
No related merge requests found
Pipeline #12607 passed with stage
in 50 minutes and 41 seconds
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