Merge remote-tracking branch 'refs/remotes/origin/master' into origin-Nanook_WIP (b1c3bd3e) · 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 b1c3bd3e authored 6 years ago by

Ghislain Loas

Browse files

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

Conflicts:
	application/modules/opac/controllers/RechercheController.php
	cosmogramme/sql/patch/patch_359.php
	tests/db/UpgradeDBTest.php

parents 98af52dc 9f932095

1 merge request!2908Nanook wip

Pipeline #5404 passed with stage

in 32 minutes and 21 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 117 additions and 169 deletions

Please register or to comment

Admin message

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