diff options
author | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
---|---|---|
committer | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
commit | 52200998c997576c9008cbe50b0a7b9f0e6134cc (patch) | |
tree | c0d68f476442b8dd86fca1e182d5c09553800810 /lib/pleroma/web/chat_channel.ex | |
parent | 4a13b8488787773d09f67d1a436d5906e2f5b171 (diff) | |
parent | 0e2ca77eec511857508208d3faeb9217c4496f8a (diff) | |
download | pleroma-52200998c997576c9008cbe50b0a7b9f0e6134cc.tar.gz pleroma-52200998c997576c9008cbe50b0a7b9f0e6134cc.zip |
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'lib/pleroma/web/chat_channel.ex')
-rw-r--r-- | lib/pleroma/web/chat_channel.ex | 1 |
1 files changed, 0 insertions, 1 deletions
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 |