Skip to content
Snippets Groups Projects
Commit 631f8e91 authored by Patrick Barroca's avatar Patrick Barroca
Browse files

version 7.5.21

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

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_289.php
	library/startup.php
	tests/db/UpgradeDBTest.php
parents c87f9166 55efb559
Branches
Tags
4 merge requests!1659Master,!1618Master,!1610Dev#35088 oai import in cosmogramme,!1595Master
Showing
with 444 additions and 177 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