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

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_307.php
	library/startup.php
	tests/db/UpgradeDBTest.php
parents fbb6b84d b91196ed
Branches
Tags
1 merge request!1840Dev#47780 digital ressources plugins
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