Commit 6aaa348e authored by Patrick Barroca's avatar Patrick Barroca 🐳

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

Conflicts:
	cosmogramme/sql/patch/patch_361.php
	tests/db/UpgradeDBTest.php
parents 6e55492e 0d307bda
Pipeline #5916 passed with stage
in 32 minutes and 19 seconds