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

Commit 80df72fb authored 5 years ago by

Patrick Barroca

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_373.php
cosmogramme/tests/php/classes/KohaRecordIntegrationTest.php
tests/db/UpgradeDBTest.php

parents de417755 8a48710a

Branches

Tags

3 merge requests!3297WIP: Master,!3218Dev#55588 contractuel explo solr indexation en texte integral des documents lies pdf html bulletins officiels minsoc,!3187Dev#55588 contractuel explo solr indexation en texte integral des documents lies pdf html bulletins officiels minsoc

Pipeline #7662 passed with stage

in 39 minutes and 2 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 656 additions and 100 deletions

Please register or to comment