Merge remote-tracking branch 'origin/stable' into origin-hotline-master (64fd5852) · 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 a problem fetching the pipeline stages.

Commit 64fd5852 authored 7 years ago by

Ghislain Loas

Browse files

Merge remote-tracking branch 'origin/stable' into origin-hotline-master

Conflicts:
	VERSIONS
	cosmogramme/sql/patch/patch_340.php
	library/startup.php
	tests/fixtures/NanookFixtures.php

parents 86b67732 cca33d7c

2 merge requests!2514Master,!2513Hotline master

Pipeline #3520 passed with stage

in 29 minutes and 8 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 296 additions and 17 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/stable' into origin-hotline-master