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

version 7.3.23

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

# Conflicts:
#	VERSIONS
#	ckeditor/core_five_filemanager/connectors/php/filemanager.php
#	library/startup.php
parents ba3b8ab2 24777650
Branches
Tags
3 merge requests!1267Master,!1221Master,!1220Hotline master
Showing
with 241 additions and 107 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