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

version 7.7.1

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

# Conflicts:
#	VERSIONS
#	library/startup.php
parents 264b3ca9 9e146604
Branches
Tags
2 merge requests!1816Master,!1815Hotline master
Showing
with 99 additions and 151 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