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

Ghislain Loas

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

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#71435_bonus_piwik_est_devenu_matomo

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

parents 6f008772 69e54977

Branches

Tags

4 merge requests!2869Master,!2846Dev#71435 bonus piwik est devenu matomo,!2841Dev#71435 bonus piwik est devenu matomo,!2822Dev#71435 bonus piwik est devenu matomo

Pipeline #5060 passed with stage

in 51 minutes and 11 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 321 additions and 184 deletions

Please register or to comment