Skip to content
Snippets Groups Projects
Commit 1c183e32 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'master' into dev#33376_api_redmine

Conflicts:
	cosmogramme/sql/patch/patch_283.php
	tests/db/UpgradeDBTest.php
parents 490a8bec 786f941f
Branches
Tags
6 merge requests!1553Master,!1502Master,!1501Stable,!1363Master,!1362Master,!1361Dev#33376 api redmine
Showing
with 202 additions and 114 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