Merge remote-tracking branch 'refs/remotes/upstream/master' into display_day_of_week_in_events (efec80b4) · 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 efec80b4 authored 10 years ago by

Laurent

Browse files

Merge remote-tracking branch 'refs/remotes/upstream/master' into display_day_of_week_in_events

Conflicts:
	application/modules/opac/controllers/CmsController.php
	tests/application/modules/opac/controllers/CmsControllerTest.php

parents fbeae67f 3bb272c8

Branches

Admin message

Merge remote-tracking branch 'refs/remotes/upstream/master' into display_day_of_week_in_events