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

version 7.9.34 

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

# Conflicts:
#	VERSIONS
#	library/startup.php
parents ed136b04 e5c76a61
Branches
Tags
3 merge requests!2334Master,!2269Master,!2268Hotline master
Pipeline #2166 failed with stage
in 13 minutes and 31 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 113 additions and 8 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