Merge branch 'master' into origin-dev#78195_pairing_ical (2ee3b3ee) · 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.

There was a problem fetching the pipeline stages.

Commit 2ee3b3ee authored 6 years ago by

Laurent

Browse files

Merge branch 'master' into origin-dev#78195_pairing_ical

Conflicts:
	library/ZendAfi/View/Helper/Accueil/Calendar.php
	tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php
	tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php

parents dd858be1 d9b28fd8

Branches

Admin message

Merge branch 'master' into origin-dev#78195_pairing_ical