Merge https://github.com/friendica/red into pending_merge

1 files changed, 13 insertions, 3 deletions

diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 9faa11fc8..33803553e 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab
+class ComposerAutoloaderInitd0f40897631bfac5572c9d06d82344bf
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitd0f40897631bfac5572c9d06d82344bf', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitd0f40897631bfac5572c9d06d82344bf', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);
@@ -31,6 +31,11 @@ class ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab
             $loader->set($namespace, $path);
         }
 
+        $map = require __DIR__ . '/autoload_psr4.php';
+        foreach ($map as $namespace => $path) {
+            $loader->setPsr4($namespace, $path);
+        }
+
         $classMap = require __DIR__ . '/autoload_classmap.php';
         if ($classMap) {
             $loader->addClassMap($classMap);
@@ -41,3 +46,8 @@ class ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab
         return $loader;
     }
 }
+
+function composerRequired0f40897631bfac5572c9d06d82344bf($file)
+{
+    require $file;
+}