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

version 7.11.13

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

# Conflicts:
#	VERSIONS
#	library/startup.php
parents 38494ee6 eb819a05
2 merge requests!2445Master,!2444Hotline master
Pipeline #3173 passed with stage
in 42 minutes and 42 seconds
Showing
with 228 additions and 40 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