-
Patrick Barroca authored
Conflicts: VERSIONS ckeditor/core_five_filemanager/connectors/php/filemanager.config.php library/Class/FileManager.php library/startup.php
84abbed0
Conflicts: VERSIONS ckeditor/core_five_filemanager/connectors/php/filemanager.config.php library/Class/FileManager.php library/startup.php