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

There was a problem fetching the latest pipeline status.

Commit 36e87b24 authored 6 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#80530_minsoc_indexation_des_resumes_indexation_tous_champs

Conflicts:
	cosmogramme/sql/patch/patch_355.php
	tests/db/UpgradeDBTest.php

parents 62666d2f 69e54977

Branches

Tags

4 merge requests!2869Master,!2854Hotline#80953 story nanook 41 caracteres accentues etalon,!2853Dev#80530 minsoc indexation des resumes indexation tous champs,!2842Dev#80530 minsoc indexation des resumes indexation tous champs

Pipeline #5072 passed with stage

in 1 hour, 29 minutes, and 9 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 110 additions and 171 deletions

Please register or to comment