Skip to content
Snippets Groups Projects
Commit ddf97a6b authored by Ghislain Loas's avatar Ghislain Loas
Browse files

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-WIP

Conflicts:
	library/Class/Users.php
parents d66a25c4 b667310d
Branches
Tags
No related merge requests found
Pipeline #3931 passed with stage
in 36 minutes and 1 second
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment