Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
index 33e395218026c142e7a4ee912d60020b2e7914db,6a2b37aecd6c104f662099f3cb51ec6acf004dca..a4f13c879b6746eea9accef186c95bffcde96f62
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -50,35 -58,7 +62,35 @@@ defmodule Pleroma.Web.Router d
      post "/favorites/create/:id", TwitterAPI.Controller, :favorite
      post "/favorites/create", TwitterAPI.Controller, :favorite
      post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite
-     post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
+ 
      post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
    end
 +
 +  pipeline :ostatus do
 +    plug :accepts, ["xml", "atom"]
 +  end
 +
 +  scope "/", Pleroma.Web do
 +    pipe_through :ostatus
 +
 +    get "/users/:nickname/feed", OStatus.OStatusController, :feed
 +    post "/push/hub/:nickname", Websub.WebsubController, :websub_subscription_request
 +  end
 +
 +  scope "/.well-known", Pleroma.Web do
 +    pipe_through :well_known
 +
 +    get "/host-meta", WebFinger.WebFingerController, :host_meta
 +    get "/webfinger", WebFinger.WebFingerController, :webfinger
 +  end
 +
 +  scope "/", Fallback do
 +    get "/*path", RedirectController, :redirector
 +  end
 +
 +end
 +
 +defmodule Fallback.RedirectController do
 +  use Pleroma.Web, :controller
 +  def redirector(conn, _params), do: send_file(conn, 200, "priv/static/index.html")
  end

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