Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 26 Mar 2020 06:43:58 +0000 (09:43 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 26 Mar 2020 06:43:58 +0000 (09:43 +0300)
commit112101ca52a98b97749a56f2476a0f941a4aabdf
tree7eeb145bbd4e024d558e0c5c6fa0855319106482
parentff1baae7e95c00e341f0f86427c4dab207e3eddc
parentaf820f8cf1c621dc8b57579c1cf8a740b6ba206a
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering

# Conflicts:
# lib/pleroma/thread_mute.ex
lib/pleroma/thread_mute.ex
lib/pleroma/user.ex
lib/pleroma/user_relationship.ex