Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master (d289d401) · 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.

There was a problem fetching the pipeline stages.

Commit d289d401 authored 8 years ago by

Ghislain Loas

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

# Conflicts:
#	VERSIONS
#	library/startup.php
#	tests/application/modules/opac/controllers/BibControllerTest.php

parents b47fceb5 8b096e6e

Branches

Tags

4 merge requests!2080Sandbox detach zf from storm,!2061Master,!2009Master,!2008Hotline master

Pipeline #363 passed with stage

in 8 minutes and 54 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 21 additions and 4 deletions

Please register or to comment