Merge remote-tracking branch 'upstream/master'

1 files changed, 25 insertions, 0 deletions

diff --git a/vendor/sabre/dav/lib/Sabre/autoload.php b/vendor/sabre/dav/lib/Sabre/autoload.php
new file mode 100644
index 000000000..2de197c9c
--- /dev/null
+++ b/vendor/sabre/dav/lib/Sabre/autoload.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * SabreDAV's autoloader
+ *
+ * This file is kept for backwards compatibility purposes.
+ * SabreDAV now uses the composer autoloader.
+ *
+ * You should stop including this file, and include 'vendor/autoload.php'
+ * instead.
+ *
+ * @deprecated Will be removed in a future version!
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+/**
+ * We are assuming that the composer autoloader is just 2 directories up.
+ *
+ * This is not the case when sabredav is installed as a dependency. But, in
+ * those cases it's not expected that people will look for this file anyway.
+ */
+
+require __DIR__ . '/../../vendor/autoload.php';