Skip to content
Snippets Groups Projects
Commit d84dccdd authored by Laurent's avatar Laurent
Browse files

Merge branch 'master' into origin-sandbox_api_auth

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_316.php
	tests/db/UpgradeDBTest.php
parents 0147fa2f 4951ef32
Branches
Tags
3 merge requests!2334Master,!2144Dev#59718 integration branche oauth,!2142Dev#59718 integration branche oauth
Pipeline #1212 failed with stage
in 11 minutes and 37 seconds
Showing
with 345 additions and 1990 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