Merge branch 'master' into origin-dev#13442_oai_cite_de_la_musique (dace62f7) · 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 dace62f7 authored 8 years ago by

Laurent

Browse files

Merge branch 'master' into origin-dev#13442_oai_cite_de_la_musique

Conflicts:
	library/Class/Album/Renderer.php
	library/Class/Batch.php
	library/Class/Systeme/ModulesMenu.php
	library/Class/TypeDoc.php
	library/Class/UserGroup.php
	tests/fixtures/RessourcesNumeriquesFixtures.php

parents 9424a273 34475593

Branches

Admin message

Merge branch 'master' into origin-dev#13442_oai_cite_de_la_musique