-
Patrick Barroca authored
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
dc430594
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