Merge branch 'hotline_6.55' into hotline_#17249_auto_open_vertical_menu (d2b4d59b) · 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 d2b4d59b authored 10 years ago by

Ghislain Loas

Browse files

Merge branch 'hotline_6.55' into hotline_#17249_auto_open_vertical_menu

Conflicts:
	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php

parents 60254a4e c7fde197

Hide whitespace changes

Inline Side-by-side

Showing with 608 additions and 405 deletions

Please register or to comment

Admin message

Merge branch 'hotline_6.55' into hotline_#17249_auto_open_vertical_menu