Merge branch 'origin-master' into origin-dev#47780_digital_ressources_plugins (a43a2699) · Commits · afi / opacce

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit a43a2699 authored 8 years ago by

Ghislain Loas

Browse files

Merge branch 'origin-master' into origin-dev#47780_digital_ressources_plugins

Conflicts:
	cosmogramme/sql/patch/patch_310.php
	library/startup.php
	tests/db/UpgradeDBTest.php

parents ca2f0d25 3f6161a6

Branches

Admin message

Merge branch 'origin-master' into origin-dev#47780_digital_ressources_plugins