Merge remote-tracking branch 'origin' into validate-user-info
authorlain <lain@soykaf.club>
Fri, 30 Nov 2018 16:34:20 +0000 (17:34 +0100)
committerlain <lain@soykaf.club>
Fri, 30 Nov 2018 16:34:20 +0000 (17:34 +0100)
commitd0ec2812bd347469ebce8a4606953bd6c901db80
treed8c77602411b24350afaa10f9b95a9d1cd7af7b2
parent8f1fffebc6796f2e0758a99d032ab3db7f2f6e0b
parent52ce368562de919f1806dfd5235642caf0666e16
Merge remote-tracking branch 'origin' into validate-user-info
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex
lib/pleroma/web/streamer.ex
lib/pleroma/web/websub/websub.ex