Use PleromaJobQueue in Pleroma.Web.Push

See merge request pleroma/pleroma!1023

Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request pleroma/pleroma!1019

OAuth consumer (sign in / sign up with external provider)

See merge request pleroma/pleroma!923

adding language tag

See merge request pleroma/pleroma!1034

Feature/770 add emoji tags

See merge request pleroma/pleroma!998

# Conflicts:
#	docs/config.md
#	test/support/factory.ex

# Conflicts:
#   config/config.exs
#   docs/config.md

Scheduled activities

See merge request pleroma/pleroma!989

Return 403 for deactivated user on token request

Closes #785

See merge request pleroma/pleroma!1031

Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS

See merge request pleroma/pleroma!1030

Upstream: Metrics and debugging

See merge request pleroma/pleroma!1020

Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs

Redirect to the referer url after mastofe authorization

Closes #717

See merge request pleroma/pleroma!1025

Revert "Merge branch 'test-coverage' into 'develop'"

See merge request pleroma/pleroma!1028

This reverts merge request !1027

Use --cover option when running CI tests

See merge request pleroma/pleroma!1027

Feature/admin api follow

See merge request pleroma/pleroma!1026

Refactor html caching functions to use a key instead of a module, use more correct terminology and fix summaries in mastoapi

See merge request pleroma/pleroma!1022