Merge branch 'master' into sandbox_author_page_ina (d7f7b4c6) · 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 d7f7b4c6 authored 6 years ago by

Laurent

Browse files

Merge branch 'master' into sandbox_author_page_ina

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

parents 46a59377 c9f84563

Branches

Tags 8.0.14

3 merge requests!3297WIP: Master,!2995Sandbox author page ina,!2990Sandbox author page ina

Hide whitespace changes

Inline Side-by-side

Showing with 114 additions and 67 deletions

Please register or to comment

Admin message

Merge branch 'master' into sandbox_author_page_ina