Merge branch 'master' into origin-dev#17871_oaista_la_vista (89b9af4e) · 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 89b9af4e authored 9 years ago by

Laurent

Browse files

Merge branch 'master' into origin-dev#17871_oaista_la_vista

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_257.php

parents 976f8476 d37b69b0

Branches

Admin message

Merge branch 'master' into origin-dev#17871_oaista_la_vista