Merge remote-tracking branch 'refs/remotes/afi/master' into afi-dev#10430_pick_day_agenda (fbe1bca6) · 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 fbe1bca6 authored 9 years ago by

Patrick Barroca

Browse files

Merge remote-tracking branch 'refs/remotes/afi/master' into afi-dev#10430_pick_day_agenda

# Conflicts:
#	cosmogramme/sql/patch/patch_278.php
#	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php

parents 5d564ecf 770fa231

Branches

Tags 7.4.26

Hide whitespace changes

Inline Side-by-side

Showing with 246 additions and 71 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'refs/remotes/afi/master' into afi-dev#10430_pick_day_agenda