Merge branch 'display_day_of_week_in_events' of... (ea2faad6) · Commits · afi / opacce · GitLab

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 ea2faad6 authored 10 years ago by

Ghislain Loas

Merge branch 'display_day_of_week_in_events' of...

Merge branch 'display_day_of_week_in_events' of http://git.afi-sa.fr/llaffont/opacce into llaffont/opacce-display_day_of_week_in_events

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

parents e9513267 efec80b4

Branches

Tags

Hide whitespace changes

Inline Side-by-side

Showing with 52 additions and 46 deletions

Please register or to comment