Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'

Add OAuth tokens endpoint

See merge request pleroma/pleroma!805

diff --cc lib/pleroma/web/oauth/token.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge

diff --cc test/web/twitter_api/twitter_api_controller_test.exs
index d6b1331bd1dce09ca64e8af80e2581a8d6593115,3922b3c5ef6136980686d3ce9e1578cd3305a0b5..1571ab68e5a453360f7a80d96e3a3864d753a8df
--- 1/test/web/twitter_api/twitter_api_controller_test.exs
--- 2/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@@ -5,14 -5,10 +5,15 @@@
  defmodule Pleroma.Web.TwitterAPI.ControllerTest do
    use Pleroma.Web.ConnCase
    alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
 -  alias Pleroma.Builders.{ActivityBuilder, UserBuilder}
 -  alias Pleroma.{Repo, Activity, User, Object, Notification}
 +  alias Pleroma.Builders.ActivityBuilder
 +  alias Pleroma.Builders.UserBuilder
 +  alias Pleroma.Repo
 +  alias Pleroma.Activity
 +  alias Pleroma.User
 +  alias Pleroma.Object
 +  alias Pleroma.Notification
    alias Pleroma.Web.ActivityPub.ActivityPub
+   alias Pleroma.Web.OAuth.Token
    alias Pleroma.Web.TwitterAPI.UserView
    alias Pleroma.Web.TwitterAPI.NotificationView
    alias Pleroma.Web.CommonAPI