fix RT and merge conflict (e872b575) · 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 e872b575 authored 8 years ago by

Patrick Barroca

Browse files

fix RT and merge conflict

Merge remote-tracking branch 'refs/remotes/afi/master' into dev#50572_2755_contractuel_pouvoir_gerer_un_site_totalement_prive

# Conflicts:
#	library/ZendAfi/Controller/Plugin/DefineURLs.php

parents 9d5c3770 573100b8

Branches

Admin message

fix RT and merge conflict