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

There was a problem fetching the latest pipeline status.

Commit ec1ee741 authored 6 years ago by

Patrick Barroca

Browse files

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

Conflicts:
	library/Class/AdminVar.php
	library/ZendAfi/View/Helper/Notice/Unimarc.php

parents 7f3be013 ed85ef55

No related merge requests found

Pipeline #3896 passed with stage

in 39 minutes and 16 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 373 additions and 31 deletions

Please register or to comment

Admin message

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