Merge branch 'develop' into feature/compat/push-subscriptions
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 6 Dec 2018 12:55:58 +0000 (19:55 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 6 Dec 2018 12:55:58 +0000 (19:55 +0700)
commit8b4397c704147bcc5ca12ab60dde32f2b6e11a41
treef1d26585be6673b495d3f4b8bea4deb5f0283d42
parent04a48286e69704bf83429b85dbcdb70863bdcff1
parent52ce368562de919f1806dfd5235642caf0666e16
Merge branch 'develop' into feature/compat/push-subscriptions

# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
lib/mix/tasks/generate_config.ex
lib/mix/tasks/sample_config.eex
lib/pleroma/application.ex
lib/pleroma/notification.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
mix.exs
mix.lock