Merge branch 'users' into 'develop'

Fix users lookup/return type

See merge request pleroma/pleroma!201

lib/pleroma/web/activity_pub/activity_pub_controller.ex

@@ -15,6 +15,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
       conn
       |> put_resp_header("content-type", "application/activity+json")
       |> json(UserView.render("user.json", %{user: user}))
+    else
+      nil -> {:error, :not_found}
     end
   end