Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master (97a68ccb) · Commits · afi / opacce · GitLab

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 97a68ccb authored 8 years ago by

Ghislain Loas

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

Conflicts:
	library/Class/Catalogue.php
	tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php

parents 62640f11 44c504aa

Branches

Tags

3 merge requests!1797Master,!1746Master,!1745Hotline master

Hide whitespace changes

Inline Side-by-side

Showing with 22 additions and 10 deletions

Please register or to comment