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
Showing
- VERSIONS 24 additions, 4 deletionsVERSIONS
- VERSIONS_HOTLINE/28103 0 additions, 1 deletionVERSIONS_HOTLINE/28103
- VERSIONS_HOTLINE/29373 0 additions, 1 deletionVERSIONS_HOTLINE/29373
- VERSIONS_HOTLINE/30552 0 additions, 1 deletionVERSIONS_HOTLINE/30552
- VERSIONS_HOTLINE/31237 0 additions, 1 deletionVERSIONS_HOTLINE/31237
- VERSIONS_HOTLINE/31425 0 additions, 1 deletionVERSIONS_HOTLINE/31425
- VERSIONS_HOTLINE/31887 0 additions, 1 deletionVERSIONS_HOTLINE/31887
- ckeditor/core_five_filemanager/connectors/php/filemanager.config.php 11 additions, 3 deletions...re_five_filemanager/connectors/php/filemanager.config.php
- ckeditor/core_five_filemanager/connectors/php/filemanager.php 0 additions, 24 deletions...itor/core_five_filemanager/connectors/php/filemanager.php
- cosmogramme/php/classes/classe_cosmopaths.php 63 additions, 57 deletionscosmogramme/php/classes/classe_cosmopaths.php
- cosmogramme/tests/php/classes/CosmoPathsTest.php 9 additions, 3 deletionscosmogramme/tests/php/classes/CosmoPathsTest.php
- includes.php 2 additions, 1 deletionincludes.php
- library/Class/FileManager.php 31 additions, 0 deletionslibrary/Class/FileManager.php
- library/Class/WebService/Premiere.php 1 addition, 1 deletionlibrary/Class/WebService/Premiere.php
- library/startup.php 3 additions, 3 deletionslibrary/startup.php
- tests/application/modules/admin/controllers/SystemeControllerWebServicesTest.php 1 addition, 2 deletions...es/admin/controllers/SystemeControllerWebServicesTest.php
- tests/library/Class/FileManagerTest.php 96 additions, 0 deletionstests/library/Class/FileManagerTest.php
- tests/library/Class/UsersTest.php 0 additions, 3 deletionstests/library/Class/UsersTest.php
Please register or sign in to comment