Merge branch 'dev_#15141_merge_agenda_from_bron_to_opac' into demo_wip_valence (fd37efe2) · 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 fd37efe2 authored 10 years ago by

Ghislain Loas

Merge branch 'dev_#15141_merge_agenda_from_bron_to_opac' into demo_wip_valence

Conflicts:
	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php

parents c960c6e2 69797fee

Branches

Tags

3 merge requests!310Master,!299Demo Wip Valence,!298valence to wip

Hide whitespace changes

Inline Side-by-side

Showing with 2 additions and 1 deletion

Please register or to comment