Merge branch 'master' into origin-dev#17990_miop_integration_suite (d530ef24) · 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 d530ef24 authored 10 years ago by

Laurent

Browse files

Merge branch 'master' into origin-dev#17990_miop_integration_suite

Conflicts:
	tests/library/Class/GlobalSqlRefactoringTest.php

parents eb87373b 1d9a81f4

Branches

Tags 7.5.35

2 merge requests!565Dev#17990 miop integration suite,!561Dev#17990 miop integration suite

Hide whitespace changes

Inline Side-by-side

Showing with 227 additions and 156 deletions

Please register or to comment

Admin message

Merge branch 'master' into origin-dev#17990_miop_integration_suite