Merge remote-tracking branch 'refs/remotes/origin/master' into... (e2ee0745) · 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 e2ee0745 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_370.php
tests/db/UpgradeDBTest.php

parents bf588d60 8c6ba4c2

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 #7023 passed with stage

in 37 minutes and 32 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 387 additions and 68 deletions

Please register or to comment