Merge branch 'develop' into 'remove-avatar-header'
authorSachin Joshi <satchin.joshi@gmail.com>
Sun, 23 Jun 2019 03:25:50 +0000 (03:25 +0000)
committerSachin Joshi <satchin.joshi@gmail.com>
Sun, 23 Jun 2019 03:25:50 +0000 (03:25 +0000)
commita0c65bbd6c708b555f457bf24ec07d2d41c3fe4a
treedeb176014e3c1dcb87fba2fe1108e276c2100148
parent1452a96ad6cfd7d250e3f7c10805994cc92016a7
parent72f365df07e2eba75d3339629b01e5a8913513e6
Merge branch 'develop' into 'remove-avatar-header'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/twitter_api_controller_test.exs