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

version 7.5.4

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

Conflicts:
	VERSIONS
	library/startup.php
parents 54d93fa0 012b8450
Branches
Tags
5 merge requests!1553Master,!1519Master,!1506Master,!1502Master,!1491Master
Showing
with 155 additions and 112 deletions
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