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

version 7.1.15

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

# Conflicts:
#	VERSIONS
#	library/startup.php
parents 9b651156 b87433ed
Branches
Tags
3 merge requests!780Master,!749Master,!748Hotline master
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