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

Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/startup.php
parents fb7b49d1 90bdaecb
Branches
Tags
2 merge requests!2334Master,!2102#57574 : correction orthographe des jours de la semaine
Pipeline #753 passed with stage
in 26 minutes and 57 seconds
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