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

Merge remote-tracking branch 'refs/remotes/origin/stable'

Conflicts:
	VERSIONS
	VERSIONS_HOTLINE/65680
	library/startup.php
parents 336a2327 9bc3571c
Branches
Tags
No related merge requests found
Pipeline #2780 passed with stage
in 25 minutes and 20 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