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

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

# Conflicts:
#	cosmogramme/sql/patch/patch_322.php
#	tests/db/UpgradeDBTest.php
parents cbd7e0f0 99ab16c6
Branches
Tags
2 merge requests!2334Master,!2109Master
Pipeline #1081 failed with stage
in 11 minutes and 30 seconds
Status
Pipeline
Created by
Stages
Actions
Failed

00:11:30

avatar

No artifacts found