Merge remote-tracking branch... (54cb3ffd) · 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 pipeline stages.

Commit 54cb3ffd authored 6 years ago by

Patrick Barroca

Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'refs/remotes/origin/dev#74753_dev_maj_connecteur_1dtouch' into origin-master

Conflicts:
	library/Class/DigitalResource/Config.php

parents cbaa8fe7 01a1f1a0

Branches

Tags 6.44.4

No related merge requests found

Pipeline #4939 passed with stage

in 45 minutes and 54 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 420 additions and 183 deletions

Please register or to comment

Admin message

Merge remote-tracking branch...