Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info

2018-12-01 09:55:46 +01:00 · 2018-12-01 09:55:46 +01:00 · c443c9bd72
commit c443c9bd72
parent 1c67277c80 8c3ff06e35
35 changed files with 1323 additions and 468 deletions
--- a/test/support/httpoison_mock.ex
+++ b/test/support/httpoison_mock.ex
@ -1,6 +1,8 @@
 defmodule HTTPoisonMock do
  alias HTTPoison.Response

+  def process_request_options(options), do: options
+
  def get(url, body \\ [], headers \\ [])

  def get("https://prismo.news/@mxb", _, _) do