squeegily
/
pleroma
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 42 Wiki Activity
Browse Source

[#1364] Resolved merge conflicts with `develop`.

pleroma-fe-2020-05-01-c67e9daf
Ivan Tashkinov 4 years ago
parent
0cda80f266
commit
f7e623c11c
1 changed files with 0 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -1
      lib/pleroma/notification.ex

+ 0
- 1
lib/pleroma/notification.ex 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


Write Preview
Loading…
Cancel
Save