projects / akkoma / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c556efb 7ee35eb)
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocke...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 13 Apr 2020 06:23:50 +0000 (09:23 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 13 Apr 2020 06:23:50 +0000 (09:23 +0300)
commitf00ff20768cbbb6eb5a6442772335dbe60fde6d4
tree934dba7fb5aa850a3a35b229bd7c6020ca3b2816tree | snapshot
parentc556efb761a3e7fc2beb4540d6f58dbfe8e4abfecommit | diff
parent7ee35eb9a6a55ef610eb02a04a33f67e5921cff3commit | diff
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users

# Conflicts:
# lib/pleroma/following_relationship.ex
lib/pleroma/following_relationship.ex diff1 | diff2 | blob | history
Fork of https://akkoma.dev/AkkomaGang/akkoma.git