Merge branch 'conversations_three' into 'develop'

Conversations once more. See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00 · 2019-05-07 14:43:21 +00:00 · 238dd72fad
commit 238dd72fad
parent 6518644db1 c42ded13a2
16 changed files with 710 additions and 34 deletions
--- a/mix.exs
+++ b/mix.exs
@ -87,7 +87,7 @@ defmodule Pleroma.Mixfile do
      {:bbcode, "~> 0.1"},
      {:ex_machina, "~> 2.3", only: :test},
      {:credo, "~> 0.9.3", only: [:dev, :test]},
-      {:mock, "~> 0.3.1", only: :test},
+      {:mock, "~> 0.3.3", only: :test},
      {:crypt,
       git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
      {:cors_plug, "~> 1.5"},