Merge remote-tracking branch 'refs/remotes/origin/master' into dev#93553_federation_des_avis (172a0d93) · 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 172a0d93 authored 5 years ago by

Patrick Barroca

Browse files

Merge remote-tracking branch 'refs/remotes/origin/master' into dev#93553_federation_des_avis

Conflicts:
	cosmogramme/sql/patch/patch_377.php
	doc/extern_libs.org
	library/ZendAfi/View/Helper/Admin/HelpLink.php
	tests/db/UpgradeDBTest.php

parents 89526f39 a473cf1b

3 merge requests!3297WIP: Master,!3248Dev#93553 federation des avis,!3217dev #93553 : federated reviews

Pipeline #8310 passed with stage

in 1 hour, 18 minutes, and 4 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 283 additions and 29 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'refs/remotes/origin/master' into dev#93553_federation_des_avis