Merge branch 'master' into 6249-subrecord-dnd

extension/qfq/qfq/report/Excel.php

@@ -25,7 +25,6 @@ require_once(__DIR__ . '/../helper/HelperFile.php');
 require_once(__DIR__ . '/../exceptions/DownloadException.php');
 //require_once(__DIR__ . '/../Evaluate.php');
 //require_once(__DIR__ . '/../helper/KeyValueStringParser.php');
-//
 //require __DIR__ . '/../../../Resources/Private/vendor/autoload.php';
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -185,4 +184,4 @@ class Excel {
 
         return $column;
     }
-}
\ No newline at end of file
+}