1
0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-27 03:55:05 +01:00

[#1364] Resolved merge conflicts with develop.

This commit is contained in:
Ivan Tashkinov 2020-04-14 20:19:08 +03:00
parent 0cda80f266
commit f7e623c11c

View File

@ -7,7 +7,6 @@ defmodule Pleroma.Notification do
alias Pleroma.Activity
alias Pleroma.FollowingRelationship
alias Pleroma.Marker
alias Pleroma.Notification
alias Pleroma.Object
alias Pleroma.Pagination