moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Calv Collins 2018-02-08 16:58:31 +00:00
parent bdb5dd2194 2f291576e4
commit 314f4775c5
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/stats.ex
View File

@ -1,5 +1,4 @@
defmodule Pleroma.Stats do defmodule Pleroma.Stats do
use Agent
import Ecto.Query import Ecto.Query
alias Pleroma.{User, Repo, Activity} alias Pleroma.{User, Repo, Activity}

1
lib/pleroma/web/chat_channel.ex
View File

@ -24,7 +24,6 @@ def handle_in("new_msg", %{"text" => text}, %{assigns: %{user_name: user_name}}
end end
defmodule Pleroma.Web.ChatChannel.ChatChannelState do defmodule Pleroma.Web.ChatChannel.ChatChannelState do
use Agent
@max_messages 20 @max_messages 20
def start_link do def start_link do