Merge remote-tracking branch 'upstream/dev' into plugin-repo

1 files changed, 15 insertions, 0 deletions

diff --git a/vendor/sabre/event/lib/PromiseAlreadyResolvedException.php b/vendor/sabre/event/lib/PromiseAlreadyResolvedException.php
new file mode 100644
index 000000000..86a6c5b3f
--- /dev/null
+++ b/vendor/sabre/event/lib/PromiseAlreadyResolvedException.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Sabre\Event;
+
+/**
+ * This exception is thrown when the user tried to reject or fulfill a promise,
+ * after either of these actions were already performed.
+ *
+ * @copyright Copyright (C) 2013-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class PromiseAlreadyResolvedException extends \LogicException {
+
+}