From: Michael <heluecht@pirati.ca>
Date: Mon, 6 May 2019 05:54:51 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into separated-confirm
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=37f9af2f24ef9bb76b8bd95737386bf752b1b689;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into separated-confirm
---

37f9af2f24ef9bb76b8bd95737386bf752b1b689
diff --cc src/App/Router.php
index 3f576d7c53,8373273b78..a71f9f0f8c
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@@ -109,10 -109,11 +109,12 @@@ class Route
  			$collector->addRoute(['GET'], '/{guid}/status_message',              Module\Diaspora\Fetch::class);
  			$collector->addRoute(['GET'], '/{guid}/reshare',                     Module\Diaspora\Fetch::class);
  		});
- 		$this->routeCollector->addRoute(['GET'],         '/filer[/{id:\d+}]',    Module\Filer::class);
+ 		$this->routeCollector->addRoute(['GET'],         '/filer[/{id:\d+}]',    Module\Filer\SaveTag::class);
+ 		$this->routeCollector->addRoute(['GET'],         '/filerm/{id:\d+}',     Module\Filer\RemoveTag::class);
 +		$this->routeCollector->addRoute(['GET', 'POST'], '/follow_confirm',      Module\FollowConfirm::class);
  		$this->routeCollector->addRoute(['GET'],         '/followers/{owner}',   Module\Followers::class);
  		$this->routeCollector->addRoute(['GET'],         '/following/{owner}',   Module\Following::class);
+ 		$this->routeCollector->addRoute(['GET'],         '/friendica[/json]',    Module\Friendica::class);
  		$this->routeCollector->addGroup('/group', function (RouteCollector $collector) {
  			$collector->addRoute(['GET', 'POST'], '[/]',                         Module\Group::class);
  			$collector->addRoute(['GET', 'POST'], '/{group:\d+}',                Module\Group::class);