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

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

# Conflicts:
#	VERSIONS
#	library/startup.php
parents da8b999c 0284e7de
Branches
Tags
3 merge requests!2334Master,!2195Master,!2194Hotline master
Pipeline #1733 canceled with stage
in 2 minutes and 17 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 3964 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