Pipelines · Merge remote-tracking branch 'refs/remotes/origin/hotline' into origin-master (6aaa348e) · 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.

There was an error fetching the commit references. Please try again later.

Commit 6aaa348e authored 6 years ago by

Patrick Barroca

Browse files

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

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

parents 6e55492e 0d307bda

2 merge requests!3297WIP: Master,!2952Master

Pipeline #5916 passed with stage

in 32 minutes and 19 seconds

Admin message

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