Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifi...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 17 Apr 2020 13:23:58 +0000 (16:23 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 17 Apr 2020 13:23:58 +0000 (16:23 +0300)
commit6e6f95c6aed77cbde1a58edcdbb5cc4f68416bca
tree923a489a9a6144bd31ff54d24140c1fd1259ae05
parentac672a9d6bfdd3cba7692f80a883bd38b0b09a57
parent09bd1d12c112fe45563c25a76afde65a3381aa26
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications

# Conflicts:
# CHANGELOG.md
CHANGELOG.md
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/views/notification_view.ex