projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91f73a7 6bd7070)
Merge branch 'refactor-add-mention-step-one' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 27 May 2020 14:17:12 +0000 (14:17 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 27 May 2020 14:17:12 +0000 (14:17 +0000)
Fix ObjectView calling into strange functions

Closes #1807

See merge request pleroma/pleroma!2580

1  2 
lib/pleroma/notification.ex patch | diff1 | diff2 | blob | history
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/notification.ex
Simple merge
diff --cc lib/pleroma/user.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git