Merge remote-tracking branch... (30c790d4) · 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 30c790d4 authored 10 years ago by

Patrick Barroca

Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'refs/remotes/afi/dev#12996_formation_ajout_zone_groupe_utilisateur' into afi-master

Conflicts:
tests/application/modules/admin/controllers/CustomFieldsControllerTest.php
tests/application/modules/admin/controllers/UserGroupControllerTest.php

parents 5771b640 d58d0583

Branches

Admin message

Merge remote-tracking branch...