Merge branch 'develop' into 'remove-twitter-api'
authorlain <lain@soykaf.club>
Sat, 16 May 2020 17:07:09 +0000 (17:07 +0000)
committerlain <lain@soykaf.club>
Sat, 16 May 2020 17:07:09 +0000 (17:07 +0000)
commitd15aa9d9503e59b3cd0731394855781f435ec63c
tree844810415def046a2fc886d0bc1baeb1ff9afb21
parent9cf4c4fa73e68f03791c5cc70505b710be39b677
parent3bc1138dd9beec03d2336fa1ad45dd23816f5285
Merge branch 'develop' into 'remove-twitter-api'

# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/web/twitter_api/util_controller_test.exs