Merge remote-tracking branch 'refs/remotes/origin/hotline-master' into origin-master (a4cfd7a7) · 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 a4cfd7a7 authored 8 years ago by

Ghislain Loas

Browse files

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

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

parents d581558a 0fd5c9e8

Branches

Admin message

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