Merge branch 'afi-master' into afi-dev#12992_custom_fields (18076942) · 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 18076942 authored 10 years ago by

Patrick Barroca

Browse files

Merge branch 'afi-master' into afi-dev#12992_custom_fields

Conflicts:
	VERSIONS
	application/modules/admin/controllers/AccueilController.php
	cosmogramme/php/_init.php
	library/Class/Rss.php
	library/Class/UserGroup.php

parents c13f83b0 756799df

Branches

Admin message

Merge branch 'afi-master' into afi-dev#12992_custom_fields