summaryrefslogtreecommitdiffstats
path: root/lib/Controller
diff options
context:
space:
mode:
authorMaxence Lange <maxence@artificial-owl.com>2018-12-19 19:57:17 -0100
committerMaxence Lange <maxence@artificial-owl.com>2018-12-19 19:57:17 -0100
commit80deaa821074d623badf684dc20556a8e3a8c785 (patch)
tree995ccd900b1e3cd0b29a14d6ce43c0f5968e7674 /lib/Controller
parent35be62836f1867c6a22a85d6f680092754a00ab4 (diff)
parent1a478d5dc6282e6e8dc4e64b023f991d3083f702 (diff)
Merge branch 'master' into framework-import-process+activity
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Diffstat (limited to 'lib/Controller')
-rw-r--r--lib/Controller/ActivityPubController.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Controller/ActivityPubController.php b/lib/Controller/ActivityPubController.php
index 9e0a9a84..8a8dd0ef 100644
--- a/lib/Controller/ActivityPubController.php
+++ b/lib/Controller/ActivityPubController.php
@@ -35,6 +35,7 @@ use Exception;
use OC\AppFramework\Http;
use OCA\Social\AppInfo\Application;
use OCA\Social\Exceptions\SignatureIsGoneException;
+use OCA\Social\Exceptions\SocialAppConfigException;
use OCA\Social\Exceptions\UnknownItemException;
use OCA\Social\Service\CacheActorService;
use OCA\Social\Service\FollowService;