Merge branch 'develop' into feature/compat/push-subscriptions
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 6 Dec 2018 13:15:16 +0000 (20:15 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 6 Dec 2018 13:15:16 +0000 (20:15 +0700)
commit4944498133d4a945650201226808b1f09d355014
tree02e83bac731ca6b391b63d826d8230bdb0fdaed8
parentbac58b152495c3ebf72e3ad1c3102de075fcc366
parentccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916
Merge branch 'develop' into feature/compat/push-subscriptions

# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
lib/pleroma/application.ex
lib/pleroma/plugs/oauth_plug.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock