projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 196cad4 d1e8910)
Merge branch 'develop' into feature/hide-follows-remote
authorrinpatch <rinpatch@sdf.org>
Thu, 25 Jul 2019 15:43:30 +0000 (18:43 +0300)
committerrinpatch <rinpatch@sdf.org>
Thu, 25 Jul 2019 15:43:30 +0000 (18:43 +0300)
1  2 
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/activity_pub/activity_pub.ex patch | diff1 | diff2 | blob | history
test/web/activity_pub/activity_pub_test.exs patch | diff1 | diff2 | blob | history

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