Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 4 Mar 2019 13:48:43 +0000 (20:48 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 4 Mar 2019 13:48:43 +0000 (20:48 +0700)
commit22ac2288be498bd6a5a6fefe2dc6d2e260a8dc39
treed5225b171c1402cf830149874e2c8a7b7e4de69b
parenteb84de01439c4ee25f59390e5be4ffa7f36e01b8
parent10248d86a2ca333de8a44e28ab0b8cee70b5d5dd
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex