Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop

2018-02-08 16:58:31 +00:00 · 2018-02-08 16:58:31 +00:00 · 314f4775c5
parent bdb5dd2194 2f291576e4
commit 314f4775c5
2 changed files with 0 additions and 2 deletions
--- a/lib/pleroma/stats.ex
+++ b/lib/pleroma/stats.ex
@ -1,5 +1,4 @@
 defmodule Pleroma.Stats do
-  use Agent
  import Ecto.Query
  alias Pleroma.{User, Repo, Activity}

--- a/lib/pleroma/web/chat_channel.ex
+++ b/lib/pleroma/web/chat_channel.ex
@ -24,7 +24,6 @@ def handle_in("new_msg", %{"text" => text}, %{assigns: %{user_name: user_name}}
 end

 defmodule Pleroma.Web.ChatChannel.ChatChannelState do
-  use Agent
  @max_messages 20

  def start_link do