Merge remote-tracking branch 'refs/remotes/origin/dev-RGAA' (5b33207c) · 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 5b33207c authored 8 years ago by

Laurent

Browse files

Merge remote-tracking branch 'refs/remotes/origin/dev-RGAA'

Conflicts:
	library/ZendAfi/View/Helper/IconeSupport.php
	library/ZendAfi/View/Helper/ReseauxSociaux.php

parents 9c32d099 6b75d3f9

Branches

Admin message

Merge remote-tracking branch 'refs/remotes/origin/dev-RGAA'