diff options
author | zotlabs <mike@macgirvin.com> | 2017-03-15 16:09:08 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-03-15 16:09:08 -0700 |
commit | c95e9b9ba52b8376eea079850caf178e223a1a6d (patch) | |
tree | d9f60eec35a69652311d46a7dbf3d1bb44871442 /vendor/composer/autoload_static.php | |
parent | e1fe637dcd05f587a5974f5062fd4b2c31e109bb (diff) | |
parent | 472a824a1eaef00759ebbdc506384e8d521e408e (diff) | |
download | volse-hubzilla-c95e9b9ba52b8376eea079850caf178e223a1a6d.tar.gz volse-hubzilla-c95e9b9ba52b8376eea079850caf178e223a1a6d.tar.bz2 volse-hubzilla-c95e9b9ba52b8376eea079850caf178e223a1a6d.zip |
could not fix the merge conflicts in composer.lock so it will need to be regenerated in the red tree.
also the autoload_classmap is a disgrace. We provide autoload functions so that we can dynamically
change the file tree without needing to regenerate a bunch of runtime stuff every time we add a file.
Merge branch 'dev' into red
Diffstat (limited to 'vendor/composer/autoload_static.php')
-rw-r--r-- | vendor/composer/autoload_static.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index a7c84b7f1..eb4311159 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -476,9 +476,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Sabre\\Xml\\Writer' => __DIR__ . '/..' . '/sabre/xml/lib/Writer.php', 'Sabre\\Xml\\XmlDeserializable' => __DIR__ . '/..' . '/sabre/xml/lib/XmlDeserializable.php', 'Sabre\\Xml\\XmlSerializable' => __DIR__ . '/..' . '/sabre/xml/lib/XmlSerializable.php', - 'Test\\Markdownify\\ConverterExtraTest' => __DIR__ . '/..' . '/pixel418/markdownify/test/ConverterExtraTest.php', - 'Test\\Markdownify\\ConverterTest' => __DIR__ . '/..' . '/pixel418/markdownify/test/ConverterTest.php', - 'Test\\Markdownify\\ConverterTestCase' => __DIR__ . '/..' . '/pixel418/markdownify/test/ConverterTestCase.php', 'Zotlabs\\Access\\AccessList' => __DIR__ . '/../..' . '/Zotlabs/Access/AccessList.php', 'Zotlabs\\Access\\PermissionLimits' => __DIR__ . '/../..' . '/Zotlabs/Access/PermissionLimits.php', 'Zotlabs\\Access\\PermissionRoles' => __DIR__ . '/../..' . '/Zotlabs/Access/PermissionRoles.php', |