Skip to content
Snippets Groups Projects
Commit a24e1057 authored by Patrick Barroca's avatar Patrick Barroca
Browse files

version 7.5.12 

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

Conflicts:
	VERSIONS
	library/Class/Users.php
	library/startup.php
parents 2e68ee53 bbee8aad
Branches
Tags 7.5.12
7 merge requests!1587Master,!1553Master,!1525Master,!1519Master,!1516Master,!1515Master,!1514Hotline master
Hide whitespace changes
Inline Side-by-side
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