Merge remote-tracking branch 'refs/remotes/afi/dev_#15884_ccbs_la_boucle_skin' into afi-master (0ff2f5a7) · 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 0ff2f5a7 authored 10 years ago by

Patrick Barroca

Browse files

Merge remote-tracking branch 'refs/remotes/afi/dev_#15884_ccbs_la_boucle_skin' into afi-master

Conflicts:
	library/ZendAfi/View/Helper/Accueil/Calendar.php
	tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php

parents 30c790d4 9057795f

Branches

Tags 7.3.20

2 merge requests!529Hotline 6.56,!425Dev#16320 loire forez skin

Hide whitespace changes

Inline Side-by-side

Showing with 399 additions and 120 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'refs/remotes/afi/dev_#15884_ccbs_la_boucle_skin' into afi-master