diff options
| author | Calv Collins <calvcoll@gmail.com> | 2018-02-08 16:58:31 +0000 |
|---|---|---|
| committer | Calv Collins <calvcoll@gmail.com> | 2018-02-08 16:58:31 +0000 |
| commit | 314f4775c580552543ae7d26d66942b450ba136b (patch) | |
| tree | 093e8de02672ebce867eb83d0f97d0be510fc031 /lib | |
| parent | bdb5dd21943f886a1b4181aebd73e60662536e93 (diff) | |
| parent | 2f291576e4eef95e6867348e24bc526058518095 (diff) | |
| download | pleroma-314f4775c580552543ae7d26d66942b450ba136b.tar.gz | |
Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/stats.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/chat_channel.ex | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex index 0484f1a2d..737e9b62e 100644 --- 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} diff --git a/lib/pleroma/web/chat_channel.ex b/lib/pleroma/web/chat_channel.ex index 268bef17d..48a3553bf 100644 --- a/lib/pleroma/web/chat_channel.ex +++ b/lib/pleroma/web/chat_channel.ex @@ -24,7 +24,6 @@ defmodule Pleroma.Web.ChatChannel do end defmodule Pleroma.Web.ChatChannel.ChatChannelState do - use Agent @max_messages 20 def start_link do |