Merge branch 'master' of git.afi-sa.fr:afi/opacce into afi-master (5af66a6d) · 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 5af66a6d authored 8 years ago by

Patrick Barroca

Browse files

Merge branch 'master' of git.afi-sa.fr:afi/opacce into afi-master

# Conflicts:
#	library/Class/Catalogue.php

parents 86f853dc ca07541c

Branches

Admin message

Merge branch 'master' of git.afi-sa.fr:afi/opacce into afi-master