Merge remote-tracking branch 'refs/remotes/origin/master' into... (1ec35350) · 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 1ec35350 authored 5 years ago by

Patrick Barroca

Browse files

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

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#55588_contractuel_explo_solr_indexation_en_texte_integral_des_documents_lies_pdf_html_bulletins_officiels_minsoc

Conflicts:
cosmogramme/sql/patch/patch_375.php
cosmogramme/tests/php/classes/KohaRecordIntegrationTest.php
tests/db/UpgradeDBTest.php

parents 9ecf004a 0c3dee9d

Pipeline #7990 passed with stage

in 38 minutes and 50 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 232 additions and 99 deletions

Please register or to comment

Admin message

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