Merge branch 'develop' into remove-twitter-api
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 29 Jun 2020 12:09:49 +0000 (16:09 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 29 Jun 2020 12:09:49 +0000 (16:09 +0400)
commit4a306720e8be8633e192f7b2c98f129a315939b9
treeed5ec059c532777a28eade72f384c8a800ead496
parentd15aa9d9503e59b3cd0731394855781f435ec63c
parent651f269568cb7e54cd96d8a0d8ea3533f77e9a3a
Merge branch 'develop' into remove-twitter-api
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex