Merge remote-tracking branch... (574c0834) · 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.

There was a problem fetching the pipeline stages.

Commit 574c0834 authored 6 years ago by

Ghislain Loas

Merge remote-tracking branch...

Merge remote-tracking branch 'refs/remotes/origin/dev#73975_creer_des_mails_types_a_envoyer_dans_la_liste_des_fonctionnalites' into origin-master

Conflicts:
	library/Class/Users.php

parents 8f16e707 b667310d

Branches

Tags

1 merge request!2660Master

Pipeline #3950 passed with stage

in 34 minutes and 48 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 103 additions and 2 deletions

Please register or to comment