Skip to content
Snippets Groups Projects
Commit 5fca8d75 authored by Sebastien ANDRE's avatar Sebastien ANDRE
Browse files

Merge commit '4e38b7fa'

# Conflicts:
#	cosmogramme/sql/patch/patch_400.php
#	tests/db/UpgradeDBTest.php
parents 54a78402 4e38b7fa
Branches
Tags
No related merge requests found
Pipeline #12720 failed with stage
in 1 hour, 2 minutes, and 57 seconds
Showing
with 265 additions and 155 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