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

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

# Conflicts:
#	cosmogramme/sql/patch/patch_403.php
#	tests/db/UpgradeDBTest.php
parents 5fca8d75 a934a355
Branches
Tags
No related merge requests found
Pipeline #12725 failed with stage
in 52 minutes and 16 seconds
Showing
with 293 additions and 81 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