Merge remote-tracking branch 'origin/RF13038' (f0ce2028) · 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 f0ce2028 authored 11 years ago by

Julian Maurice

Browse files

Merge remote-tracking branch 'origin/RF13038'

Conflicts:
	tests/application/modules/admin/controllers/ModoControllerTest.php

parents 9f586677 47a785ae

Hide whitespace changes

Inline Side-by-side

Showing with 672 additions and 319 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/RF13038'