logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
DateCommit messageAuthorFiles+-
Transmogrifier: Check object/activity existance for incoming Delete/UndoHaelwenn (lanodan) Monnier1+12-5
ConfigController: Remove db-config limit on readingHaelwenn (lanodan) Monnier1+2-2
_notice.html.eex: fixupHaelwenn (lanodan) Monnier1+1-1
profile.html.eex: fixupHaelwenn (lanodan) Monnier1+1-1
static-fe.css: Use .emoji class instead of max-height hackHaelwenn (lanodan) Monnier1+7-5
static_fe/profile.html.eex: Fix formatting, emojify bioHaelwenn (lanodan) Monnier1+1-1
static-fe.css: Do not scale images too muchHaelwenn (lanodan) Monnier1+1-3
StaticFE: center the bioHaelwenn (lanodan) Monnier2+15-1
StaticFE: Change styling & formattingHaelwenn (lanodan) Monnier3+183-9
Add fixtures on honkHaelwenn (lanodan) Monnier5+42-0
mix.exs: custom source_urlHaelwenn (lanodan) Monnier1+2-3
mix.deps: Change Linkify to my branchHaelwenn (lanodan) Monnier6+13-10
rebase.sh: script (legacy)Haelwenn (lanodan) Monnier1+6-0
[PleromaFE] Update frontendHaelwenn (lanodan) Monnier22+436-171
upgrade.sh: CreateHaelwenn (lanodan) Monnier2+41-0
Merge branch 'features/federation-status' into dev-lanodanHaelwenn (lanodan) Monnier6+112-0
Merge branch 'features/validators-note-hashtag'Haelwenn (lanodan) Monnier48+891-703
Merge branch 'bugfix/ci-majic-release' into 'develop'Haelwenn1+1-1
Merge branch 'fix/autofollower-suggestions' into 'develop'Haelwenn1+1-7
Merge branch '2239-mute-fixes' into 'develop'Haelwenn2+24-1
Merge branch 'chore/changelogfix' into 'develop'feld1+3-5
Merge branch 'refactor/discoverable_user_field' into 'develop'feld14+37-22
Merge branch 'issue/2009' into 'develop'feld11+159-4
Merge branch 'docs-indigenous' into 'develop'feld1+1-1
Merge branch 'feature/gen-magic' into 'develop'feld44+118-229
Merge branch 'refactor/locked_user_field' into 'develop'Haelwenn24+77-57
Merge branch 'bugfix/file-consistency-prod' into 'develop'Haelwenn2+1-1
Merge branch 'feature/1822-files-consistency' into 'develop'feld818+57981-57773
Update AdminFE build to latest developMark Felder135+500-236
Merge branch 'preload-frontend-config' into 'develop'lain4+24-5
Merge branch 'docs/improve-backup-restore' into 'develop'feld1+3-2
Merge branch 'improve/instance-gen' into 'develop'feld4+77-3
Merge branch 'chore/copyright-headers' into 'develop'feld53+212-0
Merge branch 'feat/deep-link-account-approval' into 'develop'feld2+2-2
Merge branch 'docs/improve-backup-restore' into 'develop'feld1+1-1
Merge branch 'docs/improve-backup-restore' into 'develop'feld1+11-7
Merge branch 'fix/2209-remoteip' into 'develop'Haelwenn5+81-41
Merge branch 'revert/rich-media-censorship' into 'develop'feld3+1-36
Merge branch 'filtering-following' into 'develop'rinpatch2+91-1
Merge branch 'feature/update-description-for-frontends-setting' into 'develop'rinpatch1+4-3
Merge branch 'feature/1893-remote-emoji-packs-pagination' into 'develop'feld11+242-136
Merge branch '2211-smol-documentation-fix' into 'develop'Haelwenn1+2-0
Merge branch 'fix/empty-params-openapi' into 'develop'rinpatch2+9-0
Merge branch 'web-push-fix' into 'develop'lain7+21-54
Merge branch 'chore/pleroma-vcl' into 'develop'feld1+5-1
Merge branch 'update/oban' into 'develop'rinpatch2+7-7
Merge branch '2201-i-hate-this' into 'develop'rinpatch4+18-3
Merge branch 'fix/2189-unpin-activity' into 'develop'Haelwenn1+3-1
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'lain17+235-33
Merge branch 'issue/2170' into 'develop'lain9+161-25
Merge branch 'fix/revert-citext-uri' into 'develop'rinpatch3+16-15
Merge branch 'fix/deprecation-warning-welcome-message' into 'develop'feld2+30-32
Merge branch 'fix/noop-policy-describe' into 'develop'feld1+2-0
Merge branch 'feature/bulk-confirmation' into 'develop'feld9+276-23
Merge branch 'search-even-more' into 'develop'rinpatch3+63-7
Merge branch 'features/incoming-create-exists' into 'develop'rinpatch2+7-3
Merge branch '2182-profile-search-improvements' into 'develop'rinpatch3+59-6
Merge branch 'fix/test-fix' into 'develop'rinpatch2+2-2
Merge branch 'smol-test' into 'develop'lain1+17-0
Merge branch 'issue/2115' into 'develop'lain6+91-69
Merge branch 'user-query/filter-out-internal' into 'develop'lain2+47-5
Merge branch 'issue/1975' into 'develop'lain15+858-534
Merge branch 'email-fix-develop' into 'develop'lain6+29-14
Merge branch 'chore/missing-link' into 'develop'feld1+4-3
Merge branch 'docs/nginx-config-fedsockets' into 'develop'feld1+20-13
Merge branch 'chore/autolinker-rename' into 'develop'feld1+1-1
Merge branch 'fix/fedsocket-useragent' into 'develop'feld1+8-3
Merge branch 'bugfix/federator-actor-error' into 'develop'lain1+11-5
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'lain7+325-176
Merge branch 'issue/2099' into 'develop'lain13+563-307
Merge branch '2161-block-changes' into 'develop'Haelwenn2+18-3
Merge branch 'weblate-pleroma-pleroma' into 'develop'lain1+580-0
Merge branch 'fix/openapi-errors' into 'develop'rinpatch8+26-14
Merge branch 'media-preview-proxy-nostream' into 'develop'feld25+988-133
Merge branch 'fix/fedsocket-log-spam' into 'develop'lain1+3-0
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'lain2+20-0
Merge branch 'websocket-data-fed' into 'develop'lain25+1476-46
Merge branch 'stable-sync/2.1.2' into 'develop'rinpatch24+335-316
Fix MRF reject for ChatMessageHaelwenn (lanodan) Monnier6+30-5
Create MRF.filter_pipeline to inject :object_data when presentHaelwenn (lanodan) Monnier6+59-15
KeywordPolicy: Still match when fields are absentHaelwenn (lanodan) Monnier1+32-35
Merge branch 'omit-nondiscoverable-from-search' into 'develop'Haelwenn9+58-24
Merge branch 'instance-docs' into 'develop'feld8+378-0
Merge branch 'fix/configdb-migration-with-deprecated' into 'develop'feld3+56-10
Merge branch 'nondiscoverable-user-metadata' into 'develop'lain4+28-7
Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop'rinpatch1+49-24
Merge branch 'chat-moderation' into 'develop'lain16+707-31
Merge branch 'chore/unused-import' into 'develop'feld1+0-1
Merge branch '2144-empty-users' into 'develop'rinpatch2+14-5
Merge branch 'feat/connection-worker-monitor-flush' into 'develop'rinpatch1+8-15
Merge branch 'chores/mrf-loglevel' into 'develop'rinpatch3+23-10
Merge branch 'features/validators-video' into 'develop'rinpatch20+514-447
Merge branch 'issue/2089' into 'develop'lain13+125-56
Merge branch 'reply-visibility-user-guard' into 'develop'lain3+11-2
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'Haelwenn4+48-4
Merge branch 'remove/managed-config-option' into 'develop'rinpatch5+29-8
Merge branch 'hotfix/rich-media-compile-error' into 'develop'rinpatch1+1-1
Merge branch 'feat/rich-media-head' into 'develop'rinpatch4+99-1
Merge branch 'fix/2139-oban-migration' into 'develop'rinpatch2+4-0
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn1+13-13
Merge branch 'chore/docs-spelling' into 'develop'feld1+1-1
Merge branch 'feat/log-possible-hol' into 'develop'rinpatch3+38-14
Merge branch 'bugfix/favicon-none-found' into 'develop'rinpatch2+53-36
Merge branch 'fix/2134-old-cron-jobs' into 'develop'Haelwenn1+20-0
Merge branch 'oban-overuse' into 'develop'rinpatch31+482-434
Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'rinpatch22+204-163
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'rinpatch46+19-7009
Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch2+22-16
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'rinpatch3+6-3
Merge branch 'fix/tesla-client-opts' into 'develop'rinpatch1+1-1
Merge branch 'fix/2132-emoji-packs' into 'develop'lain1+2-10
Merge branch 'chore/concurrent_limiter_update' into 'develop'rinpatch2+2-2
Merge branch 'weblate-pleroma-pleroma' into 'develop'lain1+586-0
Merge branch 'stable-sync/2.1.1' into 'develop'rinpatch81+306-305
Metadata: Move restriction check from Feed provider to activated_providersrinpatch3+10-17
Use :restrict_unauthenticated testing for more granular controlMark Felder3+3-3
Document breaking change for metadata providersMark Felder1+4-0
RelMe and Feed no longer configurableMark Felder1+0-2
Do not serve RSS/Atom feeds when instance is privateMark Felder5+59-10
Fix test so setting doesn't leakMark Felder1+2-0
Feed provider only generates a redirect, so always activate it.Mark Felder2+4-4
Disable providers of user and status metadata when instance is privateMark Felder3+22-2
Do not make RelMe metadata provider optional.Mark Felder2+2-2
user: harden get_friends_query(), get_followers_query() and their wrappersHaelwenn (lanodan) Monnier1+10-10
search: Apply following filter only when user is usableHaelwenn (lanodan) Monnier1+2-2
AP C2S: Restrict character limit on NoteHaelwenn (lanodan) Monnier2+39-14
Fix atom leak in AdminAPIControllerEgor Kislitsyn1+1-2
SECURITY.md: we don't support 2.0 anymore, bump to 2.1rinpatch1+1-1
Merge branch 'bugfix/mock' into 'develop'Haelwenn3+3-2
Merge branch 'develop' into 'develop'feld4+118-0
Merge branch 'bugfix/favicon-empty-test' into 'develop'Haelwenn3+0-7
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'rinpatch12+45-21
Merge branch 'fix/2108-adapter-options' into 'develop'rinpatch23+212-102
Merge branch 'feature/1790-oban-overuse' into 'develop'rinpatch10+129-50
Merge branch 'temp-hackney-fix' into 'develop'rinpatch5+16-8
Merge branch 'chore/back-to-upstream-tesla' into 'develop'rinpatch2+3-3
Merge branch 'bugfix/favicon-too-long' into 'develop'rinpatch2+45-1
Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain5+66-23
Merge branch 'fix/no-rich-media-error' into 'develop'Haelwenn2+9-6
Merge branch 'chore/add-cc-by-4' into 'develop'Haelwenn1+395-0
Merge branch 'hotfix-the-hotfix' into 'develop'rinpatch1+5-1
Merge branch 'hotfix/tesla-env-no-access' into 'develop'rinpatch1+1-1
Merge branch 'fix/pool-middleware-reverseproxy-leak' into 'develop'rinpatch3+23-10
Merge branch 'use-https-in-dockerfile' into 'develop'Haelwenn1+1-1
Merge branch 'develop' into 'develop'lain1+1-1
Merge branch 'feat/simplify-pool-managment' into 'develop'Haelwenn6+51-149
Merge branch 'chore/fast_html-bump' into 'develop'rinpatch1+1-1
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'lain11+108-16
Merge branch 'fix_install_fe_bug' into 'develop'lain2+10-2
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld4+24-28
Merge branch 'fix/1991-tzdata-update' into 'develop'lain1+12-7
Merge branch 'bugfix/mastoapi-lists' into 'develop'lain3+38-8
Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch8+66-25
Merge branch 'fix/2047-rich-media-parser' into 'develop'rinpatch4+49-38
Merge branch 'http-fixes' into 'develop'rinpatch13+95-57
Merge branch 'fix-searching-following' into 'develop'rinpatch3+20-15
Merge branch 'fix/static-fe-nil-bio-crash' into 'develop'lain12+30-10
Merge branch 'chat-relation-constraints' into 'develop'Haelwenn3+45-3
Merge branch 'issue/2068' into 'develop'lain3+79-1
Merge branch 'chore/fast-sanitize-bump' into 'develop'rinpatch1+2-2
Merge branch 'stable-sync/2.1.0' into 'develop'lain254+662-762
Merge branch 'mention-sudo-pleroma-when-updating' into 'develop'lain1+4-3
Merge branch '2078-list-fixes' into 'develop'Haelwenn3+45-5
Merge branch '2081-deleted-user-chats' into 'develop'lain2+18-1
Merge branch 'update/admin-fe-20200826' into 'develop'rinpatch33+40-40
Merge branch 'fix/fast_html-build-errors' into 'develop'rinpatch1+4-4
Merge branch '2079-welcome-message-docs' into 'develop'rinpatch1+1-1
Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'lain1+1-0
Merge branch 'buildx-multiarch-arm32v7' into 'develop'Haelwenn1+27-11
Merge branch 'feature/1952-read-muted-notifications' into 'develop'feld5+21-4
Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'Haelwenn2+19-10
Merge branch 'frontend-bundles-downloads' into 'develop'lain13+444-20
Merge branch 'docs/update-clients' into 'develop'lain1+16-19
Merge branch 'feature/add-preload-to-description' into 'develop'feld1+19-0
Merge branch 'relay-fix-admin-fe' into 'develop'feld13+149-97
Merge branch 'features/validators-event' into 'develop'lain9+172-25
Merge branch 'feature/2071-actor-type' into 'develop'lain2+50-25
Merge branch 'features/validators-audio2' into 'develop'lain10+151-29
Merge branch 'fix-arm64' into 'develop'lain1+1-1
Merge branch 'email-tests' into 'develop'lain3+6-2
Merge branch 'mix-task-fixes' into 'develop'lain3+27-16
Merge branch '2064-image-blanking' into 'develop'Haelwenn6+46-5
Merge branch 'improve/freebsd-rc-script' into 'develop'feld1+15-16
Merge branch 'freebsd-docs' into 'develop'lain2+238-0
Merge branch 'chore/improve-descriptions' into 'develop'lain1+2-2
Merge branch 'features/validators-audio' into 'develop'lain9+184-54
Merge branch 'purge-user' into 'develop'lain4+158-6
Merge branch 'features/validators_use_ectotypes' into 'develop'lain6+24-28
Merge branch 'issue/1936' into 'develop'lain6+121-79
Merge branch 'invisible-index' into 'develop'rinpatch1+7-0
Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'lain10+53-39
Merge branch 'fix/start-ssl-if-ssl-required' into 'develop'rinpatch3+9-0
Merge branch 'fix/docs-tabs' into 'develop'rinpatch14+568-373
Merge branch 'update/admin-fe-20200814' into 'develop'feld100+182-180
Merge branch '1806-mogrifun' into 'develop'lain1+4-0
Merge branch 'issue/2036-part-2' into 'develop'feld5+10-11
Merge branch 'fix/activity-expirations-again' into 'develop'feld8+76-5
Merge branch 'nitfix/side-effects-typo' into 'develop'Haelwenn1+1-1
Merge branch 'reject' into 'develop'Haelwenn14+449-359
Merge branch 'ci-fix-2' into 'develop'lain1+1-0
Merge branch 'update-frontend-2020-08-13' into 'develop'lain141+636-478
Merge branch 'cmake' into 'develop'lain2+2-2
Merge branch 'fix/users_ap_id_not_null' into 'develop'lain1+19-0
Merge branch '1152-deletion' into 'develop'lain1+5-0
Merge branch 'docs_improve_static_dir_documentation' into 'develop'feld2+53-19
Merge branch 'feature/update-welcome-setting-in-description' into 'develop'feld2+106-32
Merge branch 'issue/2036-job-monitor' into 'develop'rinpatch1+10-4
Merge branch 'set-approval-pending-default-to-false' into 'develop'lain1+15-0
Merge branch '204-fix' into 'develop'lain3+19-6
Merge branch 'admin-active-filter' into 'develop'feld2+22-0
Merge branch 'revert-a6d3bb5f' into 'develop'lain7+2-125
Merge branch 'remove-unreachable-code' into 'develop'lain1+0-10
Merge branch 'develop' into 'develop'lain6+10-5
Merge branch '2039-cmake' into 'develop'lain2+4-2
Merge branch 'fix/flaky-migration-episode-666' into 'develop'rinpatch1+5-2
Merge branch '2038-old-update-info' into 'develop'rinpatch2+5-1
Merge branch 'feat/floki-fast-html-2' into 'develop'lain5+9-6
Merge branch 'security-policy' into 'develop'lain1+16-0
Merge branch 'ensure-expiration-mix-task' into 'develop'lain4+77-11
Merge branch 'fix/ldap-auth-issues' into 'develop'lain6+53-73
Merge branch 'authenticator-docs' into 'develop'rinpatch1+0-3
Merge branch 'spoopy-user' into 'develop'lain1+7-1
Merge branch 'object-age-changelog' into 'develop'rinpatch1+1-0
Merge branch 'features/poll-validation' into 'develop'lain29+1035-209
Merge branch '2025-oauth-login-default-to-all-scopes' into 'develop'lain1+7-0
Merge branch 'whole-word-filter-hotfix' into 'develop'lain3+27-3
Merge branch 'command-available-check' into 'develop'lain7+64-12
Merge branch 'migrate-legacy-tags' into 'develop'lain2+61-0
Merge branch 'refactor/config-get' into 'develop'lain3+88-13
Merge branch 'unique-app-id' into 'develop'lain2+18-0
Merge branch 'fix/incorrect-expirations' into 'develop'lain1+19-0
Merge branch 'fix-link-color' into 'develop'lain1+1-1
Merge branch 'deactivated-user-posts' into 'develop'rinpatch7+46-9
Merge branch 'chore/consolidate-rich-media-http' into 'develop'rinpatch3+23-20
Merge branch 'fix/activity-expiration-policy' into 'develop'lain2+9-2
Merge branch 'chore/credo-alias' into 'develop'lain1+2-1
Merge branch 'email-blacklist' into 'develop'lain7+70-9
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'lain8+158-7
Merge branch 'follower-mrf-again' into 'develop'lain6+104-1
Merge branch 'config/default_ok_oldage' into 'develop'lain1+3-2
Merge branch 'object-age-fix' into 'develop'lain2+51-4
Merge branch 'indigenous-client' into 'develop'lain1+7-0
Merge branch 'reportnote-test' into 'develop'lain2+40-0
Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'lain4+103-62
Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'rinpatch1+4-1
Merge branch 'fix/gun-limiter' into 'develop'rinpatch2+2-2
Merge branch 'fix/user-agent-overriding' into 'develop'rinpatch1+4-2
Merge branch 'revert-1ac0969c' into 'develop'lain5+1-103
Merge branch 'mrf-silence-2' into 'develop'lain5+103-1
Merge branch 'deactivate-gun-again' into 'develop'lain1+1-1
Merge branch 'chore/fix-docs-typo' into 'develop'feld1+1-1
Merge branch 'fix/configdb-otp-instructions' into 'develop'feld1+39-38
Merge branch 'render-preview-cards-in-chats' into 'develop'Haelwenn4+66-8
Merge branch '1993-confirm-users-on-registration' into 'develop'Haelwenn3+85-14
Merge branch 'chore/fix-configdb-docs-formatting' into 'develop'feld1+23-22
Merge branch 'hide-reactions' into 'develop'lain8+44-3
Merge branch 'feature/captcha-expose-timeout' into 'develop'lain6+12-6
Merge branch 'issue/1933-update-dependency' into 'develop'lain3+66-71
Merge branch 'issue/1023' into 'develop'lain7+125-2
Merge branch '1996-dont-break-on-chatmessages' into 'develop'Haelwenn2+12-1
Merge branch 'bugfix/remote-user-atom' into 'develop'lain2+13-1
Merge branch 'by-approval' into 'develop'lain24+571-36
Merge branch 'fix/gun-pool-missing-cast' into 'develop'rinpatch2+12-4
Merge branch 'gun-replace-cast-with-call' into 'develop'rinpatch2+21-23
Merge branch 'chore/frontends-config-clarification' into 'develop'lain1+2-1
Merge branch 'frontend-bundles-redux' into 'develop'lain8+179-11
Merge branch 'issue/1986-earmark' into 'develop'lain1+1-1
Merge branch 'cleanup/masto_fe-default_settings' into 'develop'lain1+1-31
Merge branch 'embedded-object-federation' into 'develop'Haelwenn5+84-8
Merge branch 'issue/1934-welcome-email' into 'develop'lain19+665-49
Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'Haelwenn2+10-11
Merge branch 'fix/update-types-in-link-formatter' into 'develop'Haelwenn1+3-3
Merge branch 'patch-3' into 'develop'rinpatch1+2-2
Merge branch 'fix/mix-tasks' into 'develop'lain1+18-6
Merge branch 'unblock-domain-via-query' into 'develop'feld4+49-3
Merge branch 'feature/add-mrf-related-policies' into 'develop'feld1+14-2
Merge branch '1976-status-view-fixes' into 'develop'Haelwenn2+35-6
Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'lain20+158-82
Merge branch 'bugfix/mrf-reject-logging' into 'develop'lain4+10-2
Merge branch 'issue/1878' into 'develop'lain6+92-24
Merge branch 'linkify' into 'develop'lain15+291-52
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'lain3+10-2
Merge branch 'bugfix/limiter_git_url' into 'develop'lain1+4-3
Merge branch 'revert-2b5d9eb1' into 'develop'lain11+52-126
Merge branch 'linkify' into 'develop'lain11+126-52
Merge branch 'gopher-fix' into 'develop'lain3+15-8
Merge branch 'patch-1' into 'develop'Haelwenn1+4-1
Merge branch 'fix/followredirects-hackney' into 'develop'feld1+8-1
Merge branch 'fix-1958' into 'develop'Haelwenn3+35-0
Merge branch 'feature/expose-post-formats' into 'develop'Haelwenn3+4-1
Merge branch 'feature/totp-input-improvements' into 'develop'feld2+2-2
Merge branch 'chore/issue-template-remove-tasks' into 'develop'rinpatch1+1-3
Merge branch 'refactor/gun-pool-registry' into 'develop'feld29+908-1928
Merge branch 'refactor/notification_settings' into 'develop'feld150+669-1182
Merge branch 'features/mrf-reasons' into 'develop'rinpatch22+95-62
Merge branch 'fix/oban-pruning' into 'develop'rinpatch1+1-0
Merge branch 'issue/sign-authority' into 'develop'feld2+48-6
Merge branch 'tests/apc2s-update_outbox' into 'develop'lain1+39-0
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'feld11+284-201
Merge branch 'fix/scrubber-recompile-warnings-as-errors' into 'develop'feld2+4-2
Merge branch '1940-admin-token-oauthless-auth' into 'develop'feld21+234-254
Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'feld2+30-5
Merge branch 'fix/oban-2.0-in-db-config' into 'develop'rinpatch2+28-2
Merge branch 'config-behaviours-runtime' into 'develop'feld7+47-41
Merge branch 'features/profile-fields-emojo' into 'develop'feld2+38-4
Merge branch 'chore/improve-database-config-docs' into 'develop'feld2+157-2
Merge branch 'fix/mediaproxy-cache-settings-types' into 'develop'feld1+16-10
Merge branch '1937-renaming' into 'develop'Haelwenn2+61-4
Merge branch 'feature/upload-filter-exiftool' into 'develop'lain8+66-7
Merge branch 'patch-3' into 'develop'lain1+4-4
Merge branch 'issue/1790-updated-oban' into 'develop'feld28+62-78
Merge branch 'fix/1924-s3-descriptions' into 'develop'feld2+50-7
Merge branch 'chore/should-document-that' into 'develop'feld1+1-0
Merge branch 'proxy-range-and-chunk' into 'develop'feld2+39-21
Merge branch 'chat-federation-information' into 'develop'lain19+146-34
Merge branch 'bump-fe-2020-07-10' into 'develop'lain144+780-611
Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'Haelwenn3+15-5
Merge branch 'mix-tasks-improvement' into 'develop'lain5+42-8
Merge branch 'cluster-test-ci' into 'develop'lain2+14-16
Merge branch 'user-search-nickname-rank-boost' into 'develop'Haelwenn4+65-16
Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn2+117-112
Merge branch 'prometheus-update' into 'develop'Haelwenn2+2-1
Merge branch 'feature/add-adminfe-url-to-report-mails' into 'develop'feld2+3-1
Merge branch 'chore/use-the-alias' into 'develop'feld12+41-41
Merge branch 'fix/csp-for-captcha' into 'develop'feld2+22-11
Merge branch '1723-token-fixes' into 'develop'lain8+56-68
Merge branch 'features/favicons' into 'develop'lain13+441-2
Merge branch '1925-muting-reblogs' into 'develop'Haelwenn3+52-10
Merge branch 'follow-pipeline' into 'develop'Haelwenn31+1006-827
Merge branch 'patch-2' into 'develop'Haelwenn1+1-0
Merge branch 'patch-1' into 'develop'lain1+1-1
Merge branch 'bugfix/status-deletion' into 'develop'lain1+6-8
Merge branch 'issue/1880' into 'develop'lain2+33-5
Merge branch 'patch-3' into 'develop'lain1+1-1
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'lain4+108-24
Merge branch '1918-avatar-background-header-reset-2' into 'develop'Haelwenn9+51-275
Merge branch 'fix/twitter-rich-media-preview' into 'develop'Haelwenn2+5-1
Merge branch 'remove-twitter-api' into 'develop'lain108+1355-781
Merge branch 'develop' into 'develop'lain2+2-0
Merge branch 'bugfix/peertube-videos' into 'develop'lain5+78-24
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'Haelwenn10+366-53
Merge branch 'description-limits' into 'develop'Haelwenn8+31-2
Merge branch '1507-static-fe-prioritize-json' into 'develop'Haelwenn2+17-6
Merge branch '1915-dont-filter-announce-notifications' into 'develop'rinpatch2+25-4
Merge branch 'filter-tesla-config' into 'develop'lain3+18-5
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'lain10+32-8
Merge branch '1912-leading-trailing-space-search' into 'develop'lain2+5-1
Merge branch '1892-exclude-bots-from-search-results' into 'develop'lain2+15-1
Merge branch '1910-migration-fix' into 'develop'rinpatch1+12-4
Merge branch 'feature/1885-MRF-metadata' into 'develop'feld27+94-80
Merge branch 'activation-meta' into 'develop'feld4+16-1
Merge branch 'fetcher-fixes' into 'develop'rinpatch8+689-9
Merge branch '1907-fix-announce-streaming' into 'develop'rinpatch5+40-3
Merge branch 'feature/update-description' into 'develop'lain1+92-57
Merge branch '1716-handle-nickname-clashes' into 'develop'rinpatch2+37-0
Merge branch 'revert-651f2695' into 'develop'lain1+7-40
Merge branch 'chore/rename-user-settings-column' into 'develop'Haelwenn4+16-5
Merge branch 'preloadfixups' into 'develop'lain9+44-28
Merge branch 'patch-1' into 'develop'lain1+1-1
Merge branch 'fix-notification-filtering' into 'develop'rinpatch2+11-0
Merge branch 'fix/cast-and-validate' into 'develop'lain2+1-2
Merge branch 'fix/swoosh-sendmail' into 'develop'feld2+6-3
Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'lain2+15-1
Merge branch 'avatar-removing' into 'develop'lain1+40-7
Merge branch '1031-parent-visible' into 'develop'lain6+31-5
Merge branch 'openapi/schema-account-pleromafields' into 'develop'lain1+67-16
Merge branch 'docs/mastoapi-account-fields' into 'develop'Haelwenn1+5-1
Merge branch 'reduce-preloading-defaults' into 'develop'lain1+0-2
Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'lain1+2-2
Merge branch 'block-handling' into 'develop'Haelwenn16+285-163
Merge branch '1258-anti-link-spam-exemption' into 'develop'Haelwenn2+18-3
Merge branch 'fix-chats' into 'develop'lain2+3-30
Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop'Haelwenn1+3-14
Merge branch 'preload-data' into 'develop'feld20+609-162
Merge branch 'mastoapi-omitted' into 'develop'feld1+40-0
Merge branch 'update/admin-fe-20200625' into 'develop'feld88+107-93
Merge branch 'chore/remove-reference-to-distsn' into 'develop'lain1+1-1
Merge branch 'issue/1872-ex_aws' into 'develop'lain3+78-0
Merge branch 'fix/following-request-from-deactivated' into 'develop'lain2+11-0
Merge branch 'fix-emoji-pagination' into 'develop'lain1+1-0
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'lain10+324-54
Merge branch 'issue/1872-updated-tzdata' into 'develop'lain7+79-4
Merge branch 'moving-mrf-namespace-migration-fix' into 'develop'feld1+10-10
Merge branch 'update-validator' into 'develop'lain13+363-278
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'Haelwenn19+257-127
Merge branch 'issue/1798' into 'develop'lain9+211-73
Merge branch 'fix_1586_provide_index_md' into 'develop'lain4+28-67
Merge branch '@doc/apc2s-upload-media' into 'develop'Haelwenn1+2-1
Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'Haelwenn2+2-6
Merge branch 'warning/mastofe-settings-blob' into 'develop'Haelwenn2+2-1
Merge branch 'add-muted-to-notifications' into 'develop'lain3+40-14
Merge branch 'feature/1739-account-endpoints' into 'develop'lain6+106-44
Merge branch 'docs_use_include_for_install_further_reading' into 'develop'lain9+27-24
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'lain4+51-44
Merge branch 'weblate-pleroma-pleroma' into 'develop'lain1+580-0
Merge branch '1865-media-only' into 'develop'rinpatch3+12-2
Merge branch '1883-mrf-chat' into 'develop'rinpatch2+22-3
Merge branch 'feature/1854-emoji-pagination' into 'develop'lain10+213-51
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'lain1+24-19
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'lain5+73-1
Merge branch 'docs/attachment_links' into 'develop'lain1+1-1
Merge branch 'cleanup/object-conversation' into 'develop'lain3+3-7
Merge branch 'issue/1855' into 'develop'feld22+737-116
Merge branch 'add-troubleshooting-info' into 'develop'lain1+10-0
Merge branch '1873-pagination-fixes' into 'develop'lain5+48-13
Merge branch 'dry-up-follower-update' into 'develop'lain1+10-22
Merge branch 'fix/1787-mogrify-args' into 'develop'lain33+277-249
Merge branch 'fix/notification-type' into 'develop'rinpatch1+0-1
Merge branch 'features/users-raw_bio' into 'develop'rinpatch8+61-19
Merge branch 'release/update-otp-elixir' into 'develop'rinpatch2+7-11
Merge branch 'hotfix/notification-migration' into 'develop'lain2+29-1
Merge branch '1866-last-status-stuff' into 'develop'Haelwenn5+29-12
Merge branch 'elixir-1.9' into 'develop'rinpatch3+4-4
Merge branch 'fix/1787-mogrify-args' into 'develop'lain13+624-784
Merge branch 'merge-ogp-twitter-parsers' into 'develop'lain9+93-100
Merge branch 'notifications-filtering' into 'develop'lain8+112-41
Merge branch '1851-favorites-pagination' into 'develop'rinpatch5+71-33
Remove use of atoms in MRF.UserAllowListPolicyhref5+33-11
Fix atom leak in Rich Media ParserEgor Kislitsyn7+91-102
Merge branch 'patch-1' into 'develop'Haelwenn1+5-6
Merge branch 'recipients-experiments' into 'develop'Haelwenn3+90-20
Merge branch 'global-status-expiration' into 'develop'lain12+218-22
Merge branch 'features/mix-task-reset-mfa' into 'develop'feld4+53-0
Merge branch 'chore/bump-changelog' into 'develop'feld1+1-0
Merge branch 'feature/cli-reload-emoji' into 'develop'lain2+14-0
Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop'feld2+30-0
Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'feld1+5-0
Merge branch '1794-hashtags-construction-from-uri' into 'develop'feld2+23-0
Merge branch 'remake-remodel-dms' into 'develop'rinpatch79+3907-148
Merge branch 'add-url-to-admin-account-view' into 'develop'lain2+46-23
Merge branch 'features/mediatype-mime-valid' into 'develop'lain1+3-3
Merge branch 'openapi/admin/relay' into 'develop'lain6+246-101
Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'lain3+19-0
Merge branch 'activity-pub-use-atoms-as-keys' into 'develop'lain27+532-625
Merge branch 'features/apc2s-pagination' into 'develop'Haelwenn7+116-109
Merge branch 'features/put_if_present' into 'develop'Haelwenn14+59-106
Merge branch 'openapi/admin/config' into 'develop'lain6+1588-1350
Merge branch 'openapi/admin/reports' into 'develop'lain9+727-446
Merge branch 'openapi/update-admin-api/status' into 'develop'Haelwenn2+2-4
Merge branch 'admin-api/account-view' into 'develop'lain1+1-2
Merge branch 'patch-3' into 'develop'lain1+6-0
Merge branch 'fix/1794-hashtag-search-results' into 'develop'feld2+70-10
Merge branch 'replies-domain-block' into 'develop'lain7+385-171
Merge branch 'openapi/admin/oauth-apps' into 'develop'lain7+541-286
Merge branch 'tagline' into 'develop'lain2+2-2
Merge branch 'openapi/admin/invites' into 'develop'lain8+536-317
Merge branch 'feature/embeddable-posts' into 'develop'lain9+376-1
Merge branch 'fix/invisible-repeats' into 'develop'lain5+23-14
Merge branch 'weblate-pleroma-pleroma' into 'develop'lain1+43-41
Merge branch 'feature/status-by-id-account-view' into 'develop'lain2+9-1
Merge branch 'user-updates' into 'develop'rinpatch2+43-18
Merge branch 'only-creates-in-public-tl' into 'develop'rinpatch2+10-3
Merge branch 'default-to-hackney-again' into 'develop'lain1+2-1
Merge branch 'chore/bump-hackney' into 'develop'Haelwenn3+6-33
Merge branch 'test/fix-config-setting-in-user-test' into 'develop'lain1+1-1
Merge branch 'conversation-pagination' into 'develop'lain2+109-91
Merge branch 'bugfix/csp-unproxied' into 'develop'rinpatch1+1-1
Merge branch 'media-docs' into 'develop'rinpatch1+9-5
Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'lain1+1-1
Merge branch 'connect-src' into 'develop'rinpatch2+2-1
Merge branch 'fix-streaming' into 'develop'lain2+20-1
Merge branch 'mix/database-vacuum-options' into 'develop'feld3+76-14
Merge branch 'fix-relay-repeat-notification' into 'develop'lain3+17-7
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'rinpatch5+104-41
Merge branch 'fix/1557-gets-local-pack' into 'develop'lain4+49-17
Merge branch 'feature/1792-update-actor-type' into 'develop'lain4+56-11
Merge branch 'update-install-guides' into 'develop'lain2+4-4
Merge branch 'chore/fix-spelling' into 'develop'rinpatch2+2-2
Merge branch 'bundle/adminfe-20200527' into 'develop'rinpatch27+33-33
Merge branch 'refactor-add-mention-step-one' into 'develop'rinpatch5+32-21
Merge branch 'notification-fixes' into 'develop'rinpatch3+18-16
Merge branch 'fav-speedup' into 'develop'lain1+1-1
Merge branch 'fav-speedup' into 'develop'rinpatch1+1-4
Merge branch '1808-pleroma-sucks' into 'develop'rinpatch4+64-6
Merge branch 'apps-index' into 'develop'rinpatch1+7-0
Merge branch '1813-throttling' into 'develop'rinpatch2+3-3
Merge branch 'restore-new-image' into 'develop'lain1+1-1
Merge branch 'fix/oban-warnings' into 'develop'lain4+10-0
Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'lain3+45-8
Merge branch 'skip-crypt-test' into 'develop'lain1+1-0
Merge branch '1471-tuning-advice' into 'develop'lain2+32-1
Merge branch 'flaky-tests' into 'develop'lain1+8-4
Merge branch 'openapi/admin/status' into 'develop'lain10+5294-5078
Merge branch 'mastodon-migration-compat' into 'develop'rinpatch7+125-11
Merge branch 'priv-warning' into 'develop'lain1+1-0
Merge branch 'feature/configure-filename-truncate' into 'develop'lain6+47-14
Merge branch 'emoji-react-better-errors' into 'develop'rinpatch3+12-1
Merge branch 'fix/notifications-api' into 'develop'rinpatch3+20-9
Merge branch 'announce-validator' into 'develop'Haelwenn33+796-367
Merge branch '1113-op-mentioning' into 'develop'Haelwenn3+38-3
Merge branch 'issue/1707' into 'develop'lain2+6-5
Merge branch 'admin-logo-upload' into 'develop'lain7+48-7
Merge branch 'features/emoji_stealer' into 'develop'lain5+171-0
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'lain16+812-539
Merge branch 'issue/749' into 'develop'lain4+37-38
Merge branch 'chore/update-config-fe' into 'develop'Haelwenn2+29-9
Merge branch 'openapi/pleroma-api/emojis' into 'develop'lain9+1850-1375
Merge branch 'feature/1734-user-deletion' into 'develop'lain3+72-8
Merge branch 'openapi/fix-spec' into 'develop'lain1+6-1
Merge branch 'exposed-background-image' into 'develop'Haelwenn6+7-1
Merge branch 'issue/1509' into 'develop'lain10+293-30
Merge branch 'mastofe/bundle-2020-05-20' into 'develop'lain533+2369-2369
Merge branch 'openapi/pleroma-api/scrobble' into 'develop'Haelwenn10+206-78
Merge branch 'recipients-query-speedup' into 'develop'rinpatch4+17-16
Merge branch 'deps/update-crypt' into 'develop'lain2+2-2
Merge branch 'openapi/pleroma-api/mascot' into 'develop'Haelwenn4+101-10
Merge branch 'issue/1667' into 'develop'Haelwenn2+10-1
Merge branch 'support/docs' into 'develop'Haelwenn1+0-18
Merge branch 'openapi/use-boolean-like-in-requests' into 'develop'rinpatch6+39-35
Merge branch 'direct-timeline-with-muted-param-fix' into 'develop'lain1+1-1
Merge branch 'copyright' into 'develop'lain13+13-13
Merge branch '1778-benchmark-fix' into 'develop'lain1+20-21
Merge branch 'docs/storing-remote-media' into 'develop'lain1+38-0
Merge branch 'show-media-endpoint-fixes' into 'develop'lain4+45-16
Merge branch '1763-password-updates' into 'develop'rinpatch4+60-7
Merge branch 'weblate-pleroma-pleroma' into 'develop'lain2+586-8
Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'lain1+0-27
Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'lain17+152-152
Merge branch 'restricted-relations-embedding' into 'develop'lain31+193-323
Merge branch 'features/mastoapi_v2_media' into 'develop'lain5+230-16
Merge branch '1757-fix-unblocks-too' into 'develop'rinpatch2+24-1
Merge branch 'chore/update-fe-settings-and-docs' into 'develop'lain2+139-90
Merge branch 'fix/digest-task-otp' into 'develop'lain1+3-4
Merge branch 'fix/database-config' into 'develop'lain3+22-0
Merge branch 'openapi/nullable-request-fields' into 'develop'rinpatch8+134-23
Merge branch 'weblate-pleroma-pleroma' into 'develop'rinpatch1+587-0
Merge branch 'feature/database-configuration-whitelist' into 'develop'rinpatch5+117-16
Merge branch 'bcrypt-auth' into 'develop'lain7+22-4
Merge branch 'features/openrc-console' into 'develop'lain1+36-12
Merge branch 'openapi/pleroma-api/accounts' into 'develop'lain7+284-44
Merge branch 'pleroma_internal' into 'develop'lain1+2-1
Merge branch 'weblate-pleroma-pleroma' into 'develop'rinpatch1+86-78
Merge branch 'fix/1742-random-failing-tests' into 'develop'lain10+45-51
Merge branch 'openapi/suggestions' into 'develop'lain2+19-4
Merge branch 'openapi/statuses' into 'develop'lain71+1853-1082
Merge branch 'openapi/timelines' into 'develop'lain5+271-64
Merge branch 'upgrade-comeonin' into 'develop'lain22+37-45
Merge branch 'fix/eldap-required' into 'develop'rinpatch1+2-3
Merge branch 'streamer-get-topic' into 'develop'rinpatch5+179-103
Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'rinpatch3+35-9
Merge branch '1748-remote-following-follower-count' into 'develop'rinpatch2+11-1
Merge branch 'otp-version-update-suggestion' into 'develop'lain1+1-1
Merge branch '1020-honk-announces' into 'develop'lain2+45-0
Merge branch 'giving-up' into 'develop'rinpatch1+2-0
Merge branch 'fix/issue-1676' into 'develop'rinpatch2+7-4
Merge branch 'migration-fix-markers' into 'develop'rinpatch1+8-4
Merge branch 'chore/gettext-update' into 'develop'rinpatch2+198-561
Merge branch 'fix/streamer-timeout' into 'develop'rinpatch1+26-4
Merge branch '1439-favorite-deletion' into 'develop'lain1+14-2
Merge branch '1204-object-pruning-deletion' into 'develop'rinpatch9+166-8
Merge branch 'descriptions-fix' into 'develop'lain1+6-6
Merge branch 'shortening-modules-name' into 'develop'lain1+12-5
Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop'rinpatch2+2-1
Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'rinpatch27+360-350
Merge branch 'fix/eldap-otp' into 'develop'rinpatch1+9-1
Merge branch 'fix/healthcheck-total-alloc' into 'develop'lain2+4-1
Merge branch 'chore/changelog-sync' into 'develop'rinpatch1+20-3
Merge branch 'chore/description-grammar' into 'develop'feld1+1-1
Merge branch 'fix/adminfe-icons' into 'develop'feld2+0-0
Merge branch 'bugfix/fix-like-notifications' into 'develop'rinpatch2+46-7
Merge branch 'feature/emojireactvalidator' into 'develop'lain19+276-169
Merge branch 'issue/1276-2' into 'develop'lain13+237-26
Merge branch 'fix/privacy-notification' into 'develop'lain2+63-9
Merge branch 'feature/restrict-c2s' into 'develop'Haelwenn2+19-1
Merge branch 'feature/undo-validator-reduced' into 'develop'rinpatch22+524-627
Merge branch 'openapi/search' into 'develop'lain6+293-60
Merge branch 'fix/streamer-wrong-arg-order' into 'develop'rinpatch2+2-2
Merge branch 'fix/downgraded-deps' into 'develop'rinpatch1+21-11
Merge branch 'openapi/polls' into 'develop'lain4+162-22
Merge branch 'streamer-worker-registry' into 'develop'lain17+520-942
Merge branch 'issue/209' into 'develop'lain49+2184-34
Merge branch 'fix/syslog-compile' into 'develop'lain1+2-2
Merge branch 'docs/chat-in-cheatsheet' into 'develop'feld1+4-0
Merge branch 'feature/delete-validator' into 'develop'rinpatch27+710-385
Merge branch 'fix/apache-cert-chain' into 'develop'feld1+1-2
Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'lain9+109-24
Merge branch 'openapi/subscriptions' into 'develop'lain7+288-25
Merge branch 'openapi/markers' into 'develop'lain4+164-14
Merge branch 'bugfix/sensitive_object' into 'develop'lain3+20-7
Merge branch 'fix/1726-user-pagination' into 'develop'lain4+49-30
Merge branch 'openapi/follow_requests' into 'develop'lain3+72-4
Merge branch 'openapi/filters' into 'develop'lain6+283-52
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'lain3+12-9
Merge branch 'openapi/instance' into 'develop'lain4+177-4
Merge branch 'openapi/lists' into 'develop'lain6+265-53
Merge branch 'openapi/conversations' into 'develop'lain6+125-15
Merge branch 'openapi/scheduled_activities' into 'develop'Haelwenn8+264-34
Merge branch 'feature/1720-status-view' into 'develop'lain5+43-1
Merge branch 'feature/1737-magic-key-field' into 'develop'rinpatch4+24-50
Merge branch 'openapi/validation-plug' into 'develop'rinpatch13+173-8
Merge branch 'fix/issue-1729' into 'develop'lain2+69-8
Merge branch 'feature/update-labels-for-activating-settings' into 'develop'feld1+1-0
Merge branch 'feature/favorite-refactor' into 'develop'rinpatch8+176-124
Replace deprecated Roma by Fedi.lain1+4-4
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'rinpatch5+80-45
CHANGELOG.md: Add entry for re-registration banrinpatch1+1-0
Reword changelog entry for follow relationship bugrinpatch1+3-1
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`eugenijm3+11-2
Deactivate local users on deletion instead of deleting the recordrinpatch6+63-17
Merge branch 'fix/1732-authless-following-followers' into 'develop'rinpatch3+7-5
Merge branch 'follow-request-notifications' into 'develop'rinpatch5+3-46
Merge branch 'pleroma-fe-2020-05-02-5f90b6a3' into 'develop'rinpatch27+364-343
Merge branch 'bugfix/static-fe.css' into 'develop'Haelwenn5+195-7
Merge branch 'fix/sporadic-test-failure-alias' into 'develop'rinpatch1+0-2
Merge branch 'fix/notificatons-follow-request-validation' into 'develop'rinpatch1+10-1
Merge branch 'fix/openapi-limit' into 'develop'lain1+2-2
Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop'rinpatch3+32-9
Merge branch 'fix-notifications-loading-in-pleroma-fe' into 'develop'lain35+543-829
Merge branch 'openapi/notifications' into 'develop'lain7+325-104
Merge branch 'openapi/reports' into 'develop'lain8+148-60
Merge branch 'issue/1577' into 'develop'lain5+415-4
Merge branch 'fix/captcha' into 'develop'lain11+254-167
Merge branch 'update/admin-fe-20200429' into 'develop'rinpatch77+92-85
Merge branch 'tests/more-apc2s' into 'develop'lain1+53-17
Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'lain3+22-0
Merge branch 'emoji-upload' into 'develop'Haelwenn12+1384-902
Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'lain4+149-18
Merge branch 'fix/add-exclude-replies-openapi' into 'develop'rinpatch1+1-0
Merge branch 'automatic-authentication-and-instance-publicity-checks' into 'develop'lain55+829-408
Merge branch 'docs/notification_destroy_multiple' into 'develop'lain1+12-0
Merge branch 'openapi/account' into 'develop'rinpatch31+2238-591
Merge branch 'mongoose-secure' into 'develop'lain2+24-2
Merge branch 'img-src-blob' into 'develop'rinpatch2+2-2
Merge branch '1706-dm-timeline-failure-fix' into 'develop'lain2+14-18
Merge branch 'bugfix/announce-race-condition' into 'develop'rinpatch2+28-0
Merge branch 'reply-filtering-refactor' into 'develop'lain11+617-11
Merge branch 'openapi-improvements' into 'develop'lain16+267-244
Merge branch 'feature/remove-unused-like-code' into 'develop'lain4+15-104
Merge branch 'bugfix/repeating-announce' into 'develop'rinpatch4+28-51
Merge branch 'bugfix/null-scheduled-at' into 'develop'rinpatch2+13-1
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'lain2+36-4
Merge branch 'bugfix/1670-user-count' into 'develop'Haelwenn3+93-75
Merge branch 'fix/follow-and-blocks-import' into 'develop'Haelwenn5+65-17
Merge branch 'bugfix/following-fix-status-code' into 'develop'Haelwenn2+14-13
Merge branch 'bugfix/1543-streaming-boosts' into 'develop'Haelwenn4+51-19
Merge branch 'feature/voters-count' into 'develop'Haelwenn4+28-5
Merge branch 'worker-messages' into 'develop'Haelwenn4+18-9
Merge branch 'microformats' into 'develop'lain3+12-8
Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'lain5+25-11
Merge branch 'docs/debian-packages' into 'develop'lain2+12-20
Merge branch 'openapi/custom-emojis' into 'develop'lain5+124-4
Merge branch 'accept-deletes' into 'develop'rinpatch6+97-4
Merge branch 'router-cleanup' into 'develop'rinpatch1+40-73
Merge branch 'cleanup-subscription-controller' into 'develop'lain6+68-63
Merge branch 'fix-object_age_policy' into 'develop'lain3+37-27
Merge branch 'mrf-docs-update' into 'develop'lain1+6-3
Merge branch '1559-follow-request-notifications' into 'develop'rinpatch10+190-49
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'rinpatch1+20-11
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'Haelwenn2+8-2
Merge branch '1682-basic-auth-permissions-fix' into 'develop'rinpatch9+101-23
Merge branch 'update/pleroma-fe-20200417' into 'develop'Haelwenn29+146-692
Merge branch 'sideeffects-test' into 'develop'rinpatch2+12-2
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'rinpatch2+2-2
Merge branch 'sync-changelog' into 'develop'Haelwenn1+2-2
Merge branch 'feature/1584-client-captcha-options' into 'develop'Haelwenn15+680-3
Merge branch 'fix/1694-transfer-task-fix' into 'develop'Haelwenn2+19-22
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'Haelwenn5+52-29
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'rinpatch17+248-40
Merge branch 'fix/1691-feed-render' into 'develop'rinpatch6+28-32
Merge branch 'features/remove-user-source_data' into 'develop'rinpatch34+293-308
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'rinpatch5+37-127
Merge branch 'small-fix-rewrite_policy' into 'develop'lain1+1-1
Merge branch 'fix/1659-rate-limiter' into 'develop'Haelwenn5+27-32
Merge branch 'uploads-csp-changes' into 'develop'rinpatch1+1-0
Merge branch 'fix/openapi-form-mimetype' into 'develop'rinpatch1+1-1
Merge branch 'fix/richmedia-oban-error' into 'develop'feld1+4-1
Merge branch 'revert-60cc7d6c' into 'develop'lain11+51-213
Merge branch 'revert-13a7105b' into 'develop'lain1+1-1
Merge branch 'logger-configuration' into 'develop'feld3+71-48
Merge branch 'marker-update-fix' into 'develop'lain1+1-1
Merge branch 'chore/spelling' into 'develop'lain1+1-1
Merge branch 'fix/issue_1679' into 'develop'lain1+3-3
Merge branch 'issue/1276' into 'develop'Haelwenn11+213-51
Merge branch 'openapi/domain-blocks' into 'develop'rinpatch6+124-5
Merge branch 'output-of-relationships-in-statuses' into 'develop'rinpatch24+261-76
Merge branch 'fix/mix-tasks-failing-otp' into 'develop'rinpatch1+0-1
Merge branch 'following-relationships-optimizations' into 'develop'rinpatch17+155-55
Merge branch 'support/update_oban' into 'develop'rinpatch3+15-4
Merge branch 'chore/changelog-organization' into 'develop'feld1+2-0
Merge branch 'fix/support-conversations-pagination' into 'develop'Haelwenn4+26-6
Merge branch 'chore/fix-changelog' into 'develop'Haelwenn1+42-3
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'Haelwenn3+83-33
Merge branch 'fix-otp-version-file-in-docker' into 'develop'Haelwenn2+10-3
Merge branch 'update-changelog' into 'develop'rinpatch1+1-0
Merge branch 'notifications-dismiss-api' into 'develop'feld3+22-3
Merge branch 'fix-otp-version-file-in-docker' into 'develop'lain1+2-0
Merge branch 'fix/1658-invite-send' into 'develop'lain3+64-5
Merge branch 'open-api' into 'develop'lain13+309-8
Merge branch 'formatter-html-safe' into 'develop'lain7+41-27
Merge branch 'changelog-update' into 'develop'Haelwenn1+0-3
Merge branch 'bugfix/objectid_validator' into 'develop'Haelwenn1+4-8
Merge branch 'gun-pool-fix' into 'develop'feld2+6-1
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'rinpatch2+46-42
Merge branch 'featureflag/emoji_reactions' into 'develop'lain4+60-32
Merge branch 'improving-test-coverage' into 'develop'lain8+310-33
Merge branch 'remake-remodel-2' into 'develop'lain38+915-88
Merge branch 'fix/docs-markdown' into 'develop'feld1+11-7
Merge branch '2323-accounts-relationships-hotfix' into 'develop'feld4+15-8
Merge branch 'update/adminfe-20200331' into 'develop'feld58+68-68
Merge branch 'gun' into 'develop'feld78+3623-786
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'rinpatch4+77-1
Merge branch 'ops/fix-ci' into 'develop'Haelwenn2+4-4
Merge branch 'fix/docker-mogrify' into 'develop'feld1+3-3
Merge branch 'bugfix/funkwhale-channel' into 'develop'Haelwenn7+38-12
Merge branch 'fix/docker-mogrify' into 'develop'feld1+1-1
Merge branch 'benchmark-improvements' into 'develop'lain11+1245-778
Merge branch 'removing-grouped-reports' into 'develop'rinpatch5+1-335
Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn7+124-4
Merge branch 'relations-preloading-for-statuses-rendering' into 'develop'lain14+576-140
Merge branch 'benchmark_timeline' into 'develop'rinpatch3+85-3
Merge branch '1364-notifications-sending-control' into 'develop'rinpatch12+354-81
Merge branch 'add-test-update_credentials' into 'develop'Haelwenn1+12-0
Merge branch 'fix/activity-deletion' into 'develop'feld2+16-0
Merge branch 'admin-api-change-password' into 'develop'lain9+344-53
Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch3+7-6
Merge branch 'support-emoji-staticfe' into 'develop'rinpatch2+10-1
Merge branch 'fix/ecto_ssl_option' into 'develop'rinpatch1+1-1
Merge branch 'relationship-remove-outdated-hack' into 'develop'Haelwenn4+5-34
Merge branch 'fix-feed-pagination' into 'develop'lain13+258-53
Merge branch 'clear-config-test-improvements' into 'develop'lain84+199-367
Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'lain12+616-33
Merge branch 'feature/1635-notifications-include-types' into 'develop'lain5+70-6
Merge branch 'fix-testing' into 'develop'lain1+15-13
Merge branch 'feature/1530-removing-with_move' into 'develop'rinpatch8+10-28
Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn1+2-1
Merge branch 'feat/templates' into 'develop'rinpatch2+25-0
Merge branch 'fix-warnings-in-tests' into 'develop'rinpatch1+14-14
Merge branch 'removing-deprecated' into 'develop'rinpatch2+0-34
Merge branch 'bugfix/earmark_renderer_test' into 'develop'rinpatch1+0-0
Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch7+56-28
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'lain22+627-455
Merge branch 'f' into 'develop'Haelwenn9+21-170
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'Haelwenn5+51-65
Merge branch 'bugfix/pleroma_conversation_api' into 'develop'rinpatch1+25-8
Merge branch 'update/admin-fe-20200312' into 'develop'rinpatch67+73-73
Merge branch 'fix/cache-control-headers' into 'develop'rinpatch4+16-26
Merge branch 'feature/mastofe-admin-scope' into 'develop'rinpatch1+1-1
Merge branch 'docs/direct_conversation_id' into 'develop'rinpatch1+2-1
Merge branch 'fix/hashtags-streaming' into 'develop'rinpatch2+5-5
Merge branch 'static-accept-missing' into 'develop'rinpatch1+4-1
Merge branch 'bugfix/br-vs-newline' into 'develop'rinpatch7+357-20
Merge branch 'revert/cache-control' into 'develop'rinpatch2+2-2
Merge branch 'exclude-posts-visible-to-admin' into 'develop'feld2+10-6
Merge branch 'docs/new_user' into 'develop'rinpatch6+20-20
Merge branch 'fix/signup-without-email' into 'develop'feld5+90-5
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'rinpatch10+55-54
Merge branch 'relay-list-change' into 'develop'feld8+110-4
Merge branch 'docs/debian-install' into 'develop'rinpatch1+2-2
Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop'Haelwenn1+176-0
Merge branch 'fix/post-length-validation' into 'develop'lain2+4-2
Merge branch 'patch-1' into 'develop'lain1+2-3
Merge branch 'chore/mix-version-bump' into 'develop'rinpatch1+1-1
Merge branch 'stable' into 'develop'rinpatch29+201-681
Merge branch 'restart-fix-for-mix-tasks' into 'develop'rinpatch3+48-11
Merge branch 'revert-67cc4dce' into 'develop'feld5+7-7
Merge branch 'update/admin-fe-without-emojipack' into 'develop'lain5+7-7
Merge branch 'proper_error_messages' into 'develop'lain4+51-20
Merge branch 'fix/stats-on-startup' into 'develop'Haelwenn2+4-12
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'feld2+16-1
Merge branch 'fix/no-email-no-fail' into 'develop'lain8+75-3
Merge branch 'chore/update-copyrights' into 'develop'Haelwenn314+314-314
Merge branch 'prepared-statements-settings' into 'develop'lain3+13-1
Merge branch 'docs_cheatsheet_fix' into 'develop'rinpatch1+3-1
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'Haelwenn8+392-64
Merge branch 'chores/bump-copyright' into 'develop'Haelwenn205+205-205
Merge branch 'docs_cheatsheet' into 'develop'rinpatch1+8-4
Merge branch 'fix/easy-timeline-dos' into 'develop'rinpatch9+78-8
Merge branch 'rate-limiter-runtime-settings' into 'develop'rinpatch6+219-185
Merge branch 'chore/update-cachex' into 'develop'rinpatch2+28-26
Merge branch 'mastofe/bundle-2020-01-20' into 'develop'rinpatch1283+4547-2381
Merge branch 'descriptions-changes' into 'develop'Haelwenn1+32-0
Merge branch 'update/pleroma-fe-20200228' into 'develop'feld103+978-2458
Merge branch 'update/admin-fe-20200228' into 'develop'feld70+79-79
Merge branch 'filtered-params' into 'develop'Haelwenn1+2-0
Merge branch 'descriptions-changes' into 'develop'feld1+2-196
Merge branch 'admin-status-list' into 'develop'feld6+76-5
Merge branch 'exclude-boosts-admin-api' into 'develop'feld4+46-3
Merge branch 'feat/instance-gen-improvements' into 'develop'lain1+9-2
Merge branch 'fix/dialyzer-warnings' into 'develop'rinpatch16+35-41
Merge branch 'merge/admin-fe-20200225' into 'develop'feld21+26-26
Merge branch 'token-web-push-test' into 'develop'feld1+9-1
Merge branch 'test-fix' into 'develop'lain1+0-1
Merge branch 'fix/instance-gen-custom-static' into 'develop'rinpatch2+8-1
Merge branch 'status-visibility-count-stats' into 'develop'Haelwenn11+321-1
Merge branch 'theming_your_instance' into 'develop'lain1+74-0
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'lain3+80-18
Merge branch '1505-threads-federation' into 'develop'Haelwenn15+366-25
Merge branch 'fix/missing-config-settings' into 'develop'feld1+2-0
Merge branch 'patch-1' into 'develop'lain1+3-1
Merge branch 'migration-fixes-20' into 'develop'Haelwenn3+13-3
Merge branch 'fix/gin-fuzzy' into 'develop'Haelwenn1+2-0
Merge branch 'single_emoji_reaction' into 'develop'Haelwenn5+57-11
Merge branch 'require-signature' into 'develop'lain5+102-19
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'lain2+10-14
Merge branch 'docs_updating' into 'develop'lain2+23-11
Merge branch 'feature/new-registrations-digest' into 'develop'lain11+506-2
Merge branch 'tests-clear-config-tweaks' into 'develop'lain31+87-117
Merge branch 'fix/mrf-sample-doc' into 'develop'feld1+14-7
Merge branch 'fix/mrf-docs' into 'develop'feld1+15-13
Merge branch 'chore/config-descriptions' into 'develop'feld1+34-28
Merge branch 'fix/status-view/expires_at' into 'develop'lain2+23-2
Merge branch 'chore/standardize-mrf-behavior' into 'develop'lain3+3-4
Merge branch 'need-reboot-flag' into 'develop'lain6+217-71
Merge branch 'chore/floki-update' into 'develop'lain8+53-38
Merge branch 'update/admin-fe-20200217' into 'develop'feld37+45-45
Merge branch 'upgrade_crypto' into 'develop'rinpatch1+92-92
Merge branch 'feat/git-attributes-elixir' into 'develop'rinpatch1+2-0
Merge branch 'bugfix/link-preview-site_name' into 'develop'lain2+3-5
Merge branch 'chores/deps-to-hexpm' into 'develop'rinpatch2+25-25
Merge branch 'update/ferd/recon' into 'develop'Haelwenn2+2-2
Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'rinpatch1+1-1
Merge branch 'fix/rename-no_attachment_links-setting' into 'develop'lain6+13-12
Merge branch 'chore/fast-sanitize-bump-back' into 'develop'rinpatch1+3-3
Merge branch 'chore/config-descriptions' into 'develop'feld1+20-21
Merge branch 'fix/status_expires_in_validation' into 'develop'feld2+27-1
Merge branch 'restore-twitter-api-tests' into 'develop'feld1+142-0
Merge branch 'update/admin-fe-20200211' into 'develop'feld89+158-166
Merge branch 'revert-3fee859b' into 'develop'lain9+18-35
Merge branch 'feat/floki-fasthtml' into 'develop'lain9+35-18
Merge branch 'uguu-uwu-notices-bulge' into 'develop'lain30+400-254
Merge branch 'doc/unlisted-search' into 'develop'lain1+3-0
Merge branch 'oban-crontab-fix' into 'develop'lain1+2-1
Merge branch 'docs/kyclos' into 'develop'lain1+5-0
Merge branch 'issue/1383' into 'develop'rinpatch35+589-417
Merge branch 'docs_backup_restore' into 'develop'Haelwenn1+26-8
Merge branch 'fix/compilation-error-docs' into 'develop'rinpatch1+1-1
Merge branch 'fix/email-task-otp' into 'develop'rinpatch1+2-3
Merge branch 'fix/upload-limit-otp' into 'develop'lain4+13-23
Merge branch 'cancel-follow-request' into 'develop'Haelwenn7+115-11
Merge branch 'questions-timezone' into 'develop'rinpatch2+8-3
Merge branch 'rename_emoji_reactios' into 'develop'rinpatch12+21-21
Merge branch 'docs-fix' into 'develop'rinpatch1+1-1
Merge branch 'update/fe-bundle-20200206' into 'develop'rinpatch38+791-374
Merge branch 'mastoapi-non-html-strings' into 'develop'feld6+10-25
Merge branch 'fix/dymamic-docs' into 'develop'feld3+17-88
Merge branch 'config-changes' into 'develop'feld4+39-61
Merge branch 'fix/unpinnable-polls' into 'develop'rinpatch2+17-1
Merge branch 'removing-admin-api-endpoint' into 'develop'rinpatch5+5-74
Merge branch 'remove-linker-scheme-option' into 'develop'feld3+2-7
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'rinpatch13+318-42
Merge branch 'feature/make_attachments_cleanup_optional' into 'develop'lain6+63-7
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'rinpatch4+67-7
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'lain4+39-15
Merge branch 'emoji-reaction-fixie-fixes-uwu' into 'develop'lain5+87-2
Merge branch 'emoji-api-errors' into 'develop'feld2+10-3
Merge branch 'http-security-warning' into 'develop'feld2+48-0
Merge branch 'emoji-reactions-reacted' into 'develop'rinpatch7+47-11
Merge branch 'fix-streaming-reblog' into 'develop'Haelwenn2+65-33
Merge branch 'changelog-update' into 'develop'lain1+1-1
Merge branch 'meta-tags-parser' into 'develop'lain3+244-1
Merge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into 'develop'lain28+249-111
Merge branch 'linkify-test-expansion' into 'develop'lain1+14-1
Merge branch 'features/task-test-email' into 'develop'lain5+116-0
Merge branch 'fix/1524-link_preview' into 'develop'lain3+2916-1
Merge branch 'feature/tag_feed' into 'develop'lain23+724-354
Merge branch 'whole-db-removal' into 'develop'Haelwenn2+0-4
Merge branch 'fix/attachments-cleanup' into 'develop'feld2+38-1
Merge branch 'fix-elixir-v1.10' into 'develop'lain2+2-2
Merge branch 'translation/errors-french' into 'develop'lain1+459-0
Merge branch 'docs_introduction' into 'develop'lain1+40-30
Merge branch 'support/update_ecto' into 'develop'lain5+9-10
Merge branch 'fix/attachments-cleanup' into 'develop'lain1+6-3
Merge branch 'remove/suggestions-third-party-engine' into 'develop'Haelwenn7+5-184
Merge branch 'descriptions-fixes' into 'develop'Haelwenn1+2-2
Merge branch 'fix/runtime-config' into 'develop'feld3+7-6
Merge branch 'issue/1280' into 'develop'feld5+149-73
Merge branch 'fix/descriptions' into 'develop'feld1+153-119
Merge branch 'chore/changelog-for-dynamic-config' into 'develop'feld1+1-0
Merge branch 'fix/better-descriptions-for-email-fields' into 'develop'feld1+3-1
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'rinpatch2+1-22
Merge branch 'emoji-reaction-sanity-check' into 'develop'rinpatch2+23-2
Merge branch 'fix/removing-mdii-uploader-from-descriptions' into 'develop'rinpatch1+1-1
Merge branch 'emoji-reaction-api-change-2' into 'develop'rinpatch7+16-7
Merge branch 'fix_for_migrate_to_db_test' into 'develop'feld1+2-2
Merge branch 'truncate_config_table_on_migrate_to_db' into 'develop'feld5+46-13
Merge branch 'emoji-notifications' into 'develop'Haelwenn7+77-9
Merge branch 'develop' into 'develop'Haelwenn1+17-5
Merge branch 'no-error-404' into 'develop'rinpatch2+7-0
Merge branch 'admin-be' into 'develop'feld35+3617-1398
Merge branch 'mastofe/bundle-2020-01-22' into 'develop'rinpatch441+1566-628
Merge branch 'emoji-reaction-extensions-2' into 'develop'rinpatch9+77-46
Merge branch 'fix/attachments-cleanup' into 'develop'feld4+137-74
Merge branch 'update/adminfe-20200121-part2' into 'develop'feld65+151-136
Merge branch 'update/adminfe-20200121' into 'develop'feld7+9-9
Merge branch 'emoji-reaction-extensions' into 'develop'rinpatch4+32-2
Merge branch 'issue/1484' into 'develop'lain5+56-21
Merge branch '1521-admin-report-test-fix' into 'develop'lain1+4-4
Merge branch 'favoritng-responses' into 'develop'rinpatch4+26-10
Merge branch 'credo/version-bump-1.1.5' into 'develop'lain11+15-15
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'lain2+1-6
Merge branch 'fix-admin-api-scope' into 'develop'lain2+25-1
Merge branch 'hashtag-benchmarks' into 'develop'Haelwenn3+139-6
Merge branch 'features/cleanup-incoming-actor' into 'develop'rinpatch1+1-17
Merge branch 'feat/startup-migration-check' into 'develop'lain5+81-1
Merge branch 'ci/docker-imaging' into 'develop'feld1+22-6
Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'lain36+490-413
Merge branch 'notifications-from-account' into 'develop'lain4+49-1
Merge branch 'features/docker-updates' into 'develop'feld1+2-0
Merge branch 'features/docker-updates' into 'develop'lain1+34-10
Merge branch 'warnings-fix' into 'develop'lain1+0-2
Merge branch 'feature/ci-registry' into 'develop'lain2+39-2
Merge branch 'feature/attachments-cleanup' into 'develop'feld8+214-1
Merge branch 'updated-at-on-conversation-read' into 'develop'feld3+10-6
Merge branch 'config/benchmark' into 'develop'feld1+8-0
Merge branch 'issue/1354' into 'develop'feld13+409-326
Merge branch 'issue/1487' into 'develop'feld2+34-0
Merge branch 'patch-1' into 'develop'rinpatch1+1-1
Merge branch 'remove/remove-mdii-uploader' into 'develop'rinpatch5+1-108
Merge branch 'issue/1490' into 'develop'lain3+80-14
Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'lain36+1185-1954
Merge branch 'fix/captcha-time' into 'develop'lain1+1-1
Merge branch 'update/adminfe-20201019' into 'develop'feld108+88-817
Merge branch 'bugfix/smtp-config-examples' into 'develop'rinpatch1+2-1
Merge branch 'update-captcha' into 'develop'rinpatch2+2-2
Merge branch 'feat/doc-improvements' into 'develop'Haelwenn4+99-383
Merge branch 'increase-captcha-expiry-time' into 'develop'lain1+1-1
Merge branch 'feature/custom-runtime-modules' into 'develop'rinpatch19+84-19
Merge branch 'revert-a54aa5af' into 'develop'rinpatch4+6-130
Merge branch 'fix/twitter-card-without-attachments' into 'develop'feld2+28-3
Merge branch 'feature/status-counts-by-scope' into 'develop'feld4+130-6
Merge branch 'fix/remote-user-no-follower-counter' into 'develop'feld2+54-24
Merge branch 'remove-outdated-doc' into 'develop'Haelwenn1+0-53
Merge branch 'feature/add-event-support' into 'develop'rinpatch9+61-4
Merge branch 'ci/rum-testing-no-recompilation' into 'develop'rinpatch1+12-2
Merge branch 'hide-followers-count' into 'develop'Haelwenn2+8-2
Merge branch 'fix/remove-useless-sleep' into 'develop'lain5+39-37
Merge branch 'kocaptcha-default-endpoint' into 'develop'rinpatch2+2-2
Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop'Haelwenn1+30-25
Merge branch 'feature/native-captcha' into 'develop'lain9+69-4
Merge branch 'uguu' into 'develop'lain37+333-1146
Merge branch '1427-oauth-graceful-admin-scope' into 'develop'lain2+57-44
Merge branch 'revert-bca1512d' into 'develop'lain104+365-898
Merge branch 'test-timeout' into 'develop'lain1+3-1
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'lain2+43-1
Merge branch 'feature/report-notes' into 'develop'feld15+272-151
Merge branch 'issue/1411' into 'develop'feld6+127-42
Merge branch 'chore/fast_sanitize_bump' into 'develop'rinpatch1+2-2
Merge branch 'admin-scope-support-code' into 'develop'rinpatch104+898-365
Merge branch 'domain-block-precedence' into 'develop'rinpatch4+70-3
Merge branch '1427-oauth-admin-scopes' into 'develop'lain3+56-10
Merge branch 'fix/unsubscribe-route' into 'develop'feld1+3-0
Merge branch '1427-oauth-admin-scopes' into 'develop'lain15+289-63
Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'lain9+35-5
Merge branch 'fix/load_config' into 'develop'rinpatch2+83-1
Merge branch 'fix/prefer-url-over-search' into 'develop'rinpatch2+8-3
Merge branch 'user-timelines-changelog' into 'develop'rinpatch1+1-0
Merge branch 'fix/otp-parsers' into 'develop'lain2+22-8
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'lain2+166-62
Merge branch 'fix/user-list-task' into 'develop'lain1+3-3
Merge branch 'issue/1342' into 'develop'lain16+273-48
Merge branch 'fix/oauth-compile-time' into 'develop'lain2+3-6
Merge branch 'feature/otp-configurable-scrubbers' into 'develop'lain8+231-214
Merge branch 'feat/docs-otp-source-picker' into 'develop'rinpatch9+238-83
Merge branch 'move-api-docs' into 'develop'rinpatch1+1-0
Merge branch 'fix/clause-never-matches' into 'develop'rinpatch3+3-1
Merge branch 'improve-move-notificaions-api' into 'develop'rinpatch7+54-10
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'rinpatch3+58-1
Merge branch 'feature/1455-chat-character-limit' into 'develop'rinpatch7+42-3
Merge branch 'fix/mrf-delete' into 'develop'lain7+32-6
Merge branch '1335-user-api-id-fields-relations' into 'develop'lain34+764-264
Merge branch 'feature/admin-api-render-whole-status' into 'develop'feld7+196-122
Merge branch 'fix_test' into 'develop'lain1+3-0
Merge branch 'feature/move-activity' into 'develop'lain24+354-51
Merge branch 'update-floki' into 'develop'rinpatch2+1-2
Merge branch 'remove-info-from-users' into 'develop'rinpatch5+14-27
Merge branch 'hide-relation-for-friendica' into 'develop'rinpatch5+75-4
Merge branch 'benchmarks/favourites_timeline' into 'develop'rinpatch3+52-1
Merge branch 'fix/extract_first_external_url' into 'develop'lain2+12-0
Merge branch 'bugfix/1447-set-following' into 'develop'rinpatch1+53-0
Merge branch 'chore/manual-benchmark' into 'develop'rinpatch1+1-0
Merge branch 'use-pg12-in-ci' into 'develop'lain1+1-1
Merge branch 'fed-testing-updates' into 'develop'lain6+285-6
Merge branch 'cleanup-tests-output' into 'develop'lain3+7-1
Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop'kaniini2+10-2
Merge branch 'remove-user-info' into 'develop'lain4+23-94
Merge branch 'feature/direct_conversation_id_web_push' into 'develop'lain3+19-9
Merge branch 'fix/prod-syslog-level' into 'develop'feld1+1-0
Merge branch 'fix/ap-disable-remote-render' into 'develop'lain6+48-99
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'feld5+81-0
Merge branch 'fix/update-reports-old-format' into 'develop'feld2+8-1
Merge branch 'feature/useragent-override' into 'develop'rinpatch4+30-3
Merge branch 'fix/release-envvars' into 'develop'rinpatch1+2-2
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain8+197-30
Merge branch 'list-users' into 'develop'rinpatch3+24-0
Merge branch 'revert-5c6c3026' into 'develop'rinpatch1+1-1
Merge branch 'fix/mix-task-logging' into 'develop'lain5+12-4
Merge branch 'issue/1348' into 'develop'lain10+143-17
Merge branch 'fix/user-following-count' into 'develop'lain2+34-27
Merge branch 'remove-useless-warning' into 'develop'lain1+8-14
Merge branch 'fix/sporadic-tests' into 'develop'lain2+2-2
Merge branch 'fix-docker-build' into 'develop'lain1+0-1
Merge branch 'chore/bump-fe' into 'develop'rinpatch15+114-98
Merge branch 'feature/admin-api/support-token-header' into 'develop'lain4+58-19
Merge branch 'docs/remove_activation_status_endpoint' into 'develop'feld1+0-8
Merge branch 'chore/bump-fast-sanitize' into 'develop'rinpatch1+2-2
Merge branch 'chore/changelog-sync-' into 'develop'rinpatch1+19-0
Merge branch 'nodeinfo-fields-limit' into 'develop'kaniini2+33-0
Merge branch 'mix-task-warning' into 'develop'rinpatch1+3-0
Merge branch 'bugfix/1395-email-activation' into 'develop'rinpatch6+36-4
Merge branch 'feature/mrf-object-age-policy' into 'develop'lain5+219-0
Merge branch 'fix/conversations-rendering' into 'develop'rinpatch1+4-1
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'feld11+605-133
Merge branch 'ci/disable-trace' into 'develop'rinpatch1+2-2
Merge branch 'reactions' into 'develop'rinpatch19+1400-3
Merge branch 'static-fe-object-id' into 'develop'lain2+69-6
Merge branch 'fix-rate-limiter-test' into 'develop'lain1+1-1
Merge branch 'fix-docs-formatting' into 'develop'rinpatch1+24-14
Merge branch 'static-remote-redirect' into 'develop'lain2+7-2
Merge branch 'bugfix/1360-actorless-posts' into 'develop'rinpatch2+12-0
Merge branch 'fix/docs-static-fe-category' into 'develop'rinpatch1+8-8
Merge branch 'nodeinfo-federation-enabled' into 'develop'feld2+25-0
Merge branch 'feature/static-fe' into 'develop'kaniini16+685-0
Merge branch 'fix-dokku-2' into 'develop'lain1+1-0
Merge branch 'patch-1' into 'develop'rinpatch1+1-1
Merge branch 'chore/changelog-1940' into 'develop'rinpatch1+1-0
Merge branch 'update-ci' into 'develop'lain1+4-4
Merge branch 'update-docs' into 'develop'lain2+11-3
Merge branch 'iss-1376' into 'develop'lain2+40-1
Merge branch 'fix/1399' into 'develop'lain3+6-2
Merge branch 'new-rate-limiter' into 'develop'lain16+450-260
Merge branch 'disable-attachment-links' into 'develop'lain2+3-2
Merge branch 'issue/1339' into 'develop'lain10+90-58
Merge branch 'refactor/readme' into 'develop'lain1+28-65
Merge branch 'refactor/cheatsheet' into 'develop'kaniini1+432-442
Merge branch 'chore/update-fe' into 'develop'rinpatch18+262-200
Merge branch 'bugfix/containment-no-id' into 'develop'rinpatch2+17-3
Merge branch 'chore/bump-fast-sanitize-again-again' into 'develop'rinpatch1+2-2
Merge branch 'chore/add-multifetch' into 'develop'kaniini1+1-0
Merge branch 'chore/bump-fast-sanitize-again' into 'develop'rinpatch1+2-2
Merge branch 'chore/bump-fast-sanitize' into 'develop'rinpatch3+5-6
Merge branch 'recipients-filter' into 'develop'kaniini4+88-0
Merge branch 'fix/unwrapped-object-return' into 'develop'rinpatch1+1-1
Merge branch 'fix/trailing-format-plug-oauth' into 'develop'rinpatch1+2-1
Merge branch 'changelog-cleanup' into 'develop'rinpatch1+4-16
Merge branch 'fix/saner-static-cache-control' into 'develop'rinpatch2+2-2
Merge branch 'feature/multiple-users-force-password-reset' into 'develop'feld6+26-8
Merge branch 'fix/object-reinject-set-cache' into 'develop'rinpatch2+18-1
Merge branch 'ci/remove-docs-build' into 'develop'Haelwenn1+0-16
Merge branch 'chore/bump-htmlentities' into 'develop'rinpatch2+2-2
Merge branch 'failing-search-fixes' into 'develop'rinpatch2+1-18
Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop'lain6+45-6
Merge branch 'transmogrifier-test-errors' into 'develop'lain1+16-5
Merge branch 'missing-tesla-mocks' into 'develop'lain3+38-8
Merge branch 'chore/update-fast-sanitize' into 'develop'kaniini2+3-3
Merge branch 'faster-user-deactivation' into 'develop'kaniini1+6-1
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'lain8+179-41
Merge branch 'chore/update-fast-sanitize' into 'develop'kaniini1+1-1
Merge branch 'bugfix/streamer-follows' into 'develop'rinpatch2+19-1
Merge branch 'feature/omit-relay-user' into 'develop'kaniini3+44-1
Merge branch 'feature/fast_sanitize' into 'develop'kaniini10+142-138
Merge branch 'fix/migration-schema' into 'develop'Haelwenn1+3-3
Merge branch 'fix/moderation-log-crash' into 'develop'kaniini1+76-0
Merge branch 'fix-recipients-from-activity' into 'develop'kaniini2+45-21
Merge branch 'refactor/db-add-defaults' into 'develop'lain1+68-0
Merge branch 'fix/blocked-follows' into 'develop'rinpatch1+112-0
Merge branch 'fix/migrations-same-module-name' into 'develop'rinpatch1+1-1
Merge branch 'fix-follow-requests' into 'develop'rinpatch3+55-0
Merge branch 'fix/migration' into 'develop'lain1+0-2
Merge branch 'refactor/following-relationships' into 'develop'lain33+537-248
Merge branch 'improve-user-info-migration' into 'develop'kaniini2+75-64
Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'kaniini1+46-0
Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop'kaniini1+25-0
Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-activities' into 'develop'kaniini1+17-0
Merge branch 'readme-pg-contrib' into 'develop'kaniini1+1-1
Merge branch 'conversation-read-status-for-blocking-user' into 'develop'kaniini5+175-11
Merge branch 'remove-unsed-info-fields-fn' into 'develop'rinpatch1+0-48
Merge branch 'fix/pleroma-ctl-fix-shift-dash' into 'develop'kaniini1+7-3
Merge branch 'object-fetch-errors' into 'develop'kaniini2+10-1
Merge branch 'fix/readme' into 'develop'kaniini1+1-1
Merge branch '1304-user-info-deprecation' into 'develop'feld87+1383-1339
Merge branch 'bugfix/announce-with-bare-to-cc' into 'develop'kaniini3+105-21
Merge branch 'chore/add-single-value-deserialization-tests' into 'develop'kaniini1+44-0
Merge branch 'feature/push-subject-for-dm' into 'develop'kaniini2+34-5
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'rinpatch2+16-11
Merge branch 'feature/masto_api_markers' into 'develop'kaniini10+353-0
Merge branch 'feature/activitypub-semantics' into 'develop'kaniini15+168-10
Merge branch 'chore/add-missing-websub-drop-migration' into 'develop'kaniini1+8-0
Merge branch 'chore/fixup-testsuite-import' into 'develop'kaniini1+0-1
Merge branch 'feature/mastofe-pwa' into 'develop'Haelwenn7+114-1
Merge branch 'mark-all-conversations-as-read' into 'develop'Haelwenn7+72-0
Merge branch 'develop-version-bump' into 'develop'rinpatch1+1-1
Merge branch 'mix-emoji-task-pack-json' into 'develop'rinpatch1+15-13
Merge branch 'patch-1' into 'develop'rinpatch1+1-1
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'rinpatch2+6-2
Merge branch 'feature/relay-list' into 'develop'kaniini7+124-7
Merge branch 'feature/ostatus-removal' into 'develop'kaniini56+100-3889
Merge branch 'fix/changelog-typo' into 'develop'rinpatch1+1-1
Merge branch 'chore/develop-changelog-sync' into 'develop'rinpatch1+70-37
Merge branch 'backport/develop-safe-jsonb' into 'develop'rinpatch6+42-8
Merge branch 'cleanup/deprecated_config_upload' into 'develop'rinpatch2+4-32
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'kaniini1+7-0
Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'feld7+91-13
Merge branch 'user-search-experiments' into 'develop'lain2+63-129
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'feld9+357-120
Merge branch 'benchmark-finishing' into 'develop'lain10+853-4
Merge branch 'exclude-visibilities-for-timelines' into 'develop'feld9+295-42
Merge branch 'backport/develop-branch-hiding-fix' into 'develop'rinpatch1+1-1
Merge branch 'master-to-stable' into 'develop'rinpatch15+22-17
Merge branch 'incoming-id-fixes' into 'develop'lain5+48-33
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'rinpatch1+2-4
Merge branch 'pleroma-ctl-enchancements' into 'develop'Haelwenn1+65-29
Merge branch 'unicode-search' into 'develop'kaniini2+28-5
Merge branch 'webfinger-mocks' into 'develop'kaniini8+246-0
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'lain3+25-1
Merge branch 'feature/count-statuses-task' into 'develop'lain3+62-0
Merge branch 'chore/format-migrations' into 'develop'rinpatch94+406-265
Merge branch 'chore/bump-fe-122323f3' into 'develop'rinpatch28+253-204
Merge branch 'bugfix/exclude-replies' into 'develop'kaniini2+3-2
Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'kaniini17+513-251
Merge branch 'chore/context-cleanups' into 'develop'kaniini1+1-6
Merge branch 'mrf/simple_policy/check_actor' into 'develop'kaniini3+25-6
Merge branch '1260-rate-limited-auth-actions' into 'develop'Haelwenn5+16-2
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'Haelwenn36+721-267
Merge branch 'fix/bad-migration' into 'develop'kaniini1+1-12
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'kaniini9+35-21
Merge branch 'fix/report-email' into 'develop'feld3+4-3
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'Haelwenn2+69-6
Merge branch 'split-masto-api/leftovers' into 'develop'kaniini7+140-160
Merge branch 'accept-embedded-announce-object' into 'develop'kaniini5+145-1
Merge branch 'unread-conversation-count' into 'develop'kaniini12+218-10
Merge branch 'update-activity-fixes' into 'develop'kaniini6+17-6
Merge branch 'revert-5c04e817' into 'develop'kaniini11+10-207
Merge branch 'issue/1296' into 'develop'kaniini5+0-142
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'kaniini7+81-22
Merge branch 'user-info-unread-direct-conversation' into 'develop'kaniini11+207-10
Merge branch 'fix/extended-nickname-format-default-config' into 'develop'kaniini2+3-1
Merge branch 'undo-fixes' into 'develop'kaniini3+15-8
Merge branch 'featrue/job-monitor' into 'develop'lain7+171-5
Merge branch 'fix/nickname-fail' into 'develop'lain3+59-1
Merge branch 'bugfix/notification-nil-actor' into 'develop'lain2+38-28
Merge branch 'fix/oauth-controller' into 'develop'lain1+1-1
Merge branch 'docs/frontend_configuration' into 'develop'rinpatch1+1-1
Merge branch 'mkdocs-migration-prep' into 'develop'rinpatch48+1640-1647
Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop'rinpatch14+325-285
Merge branch 'split-masto-api/instance' into 'develop'kaniini6+140-113
Merge branch 'accept-embedded-announce-object' into 'develop'kaniini2+35-0
Merge branch 'get_announce_visibility-name' into 'develop'kaniini1+3-3
Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'kaniini3+38-7
Merge branch 'split-masto-api/auth' into 'develop'kaniini5+215-173
Merge branch 'features/private-reblogs' into 'develop'kaniini9+115-9
Merge branch 'update/admin-fe-20191001' into 'develop'kaniini70+136-136
Merge branch 'feature/expose-attachment-size' into 'develop'feld3+11-2
Merge branch 'feature/track-reverse-proxy-failures' into 'develop'feld4+80-9
Merge branch 'split-masto-api/apps' into 'develop'kaniini6+103-82
Merge branch 'split-masto-api/suggestions' into 'develop'kaniini5+156-133
Merge branch 'split-masto-api/media' into 'develop'kaniini5+136-116
Merge branch 'split-masto-api/polls' into 'develop'kaniini11+454-419
Merge branch 'compact-undos' into 'develop'kaniini3+72-0
Merge branch 'ci/build-otp-maint' into 'develop'kaniini1+1-0
Merge branch 'split-masto-api/mascots' into 'develop'kaniini5+116-93
Merge branch 'update/admin-fe-20190930' into 'develop'kaniini69+140-133
Merge branch 'split-masto-api/accounts' into 'develop'kaniini31+2306-2296
Merge branch 'fix/report-controller-test' into 'develop'kaniini1+1-1
Merge branch 'features/apc2s-media-upload' into 'develop'kaniini6+79-3
Merge branch 'split-masto-api/reports' into 'develop'kaniini6+106-96
Merge branch 'split-masto-api/conversations' into 'develop'kaniini6+116-106
Merge branch 'cleanup/drop-subscription-table-if-exists' into 'develop'kaniini1+16-0
Merge branch 'feature/scrobbling' into 'develop'kaniini16+458-3
Merge branch 'revert/subscription-refactoring' into 'develop'rinpatch14+11-709
Merge branch 'feature/follow-requests-count' into 'develop'kaniini3+92-0
Merge branch 'chores/1691-breaking-change' into 'develop'Haelwenn2+3-3
Merge branch 'chore/update-docs' into 'develop'Haelwenn1+4-4
Merge branch 'tests/mastodon_api_controller.ex' into 'develop'Haelwenn10+402-139
Merge branch 'bugfix/post-empty-status' into 'develop'Haelwenn2+6-3
Merge branch 'fix/empty-attachment-statuses' into 'develop'rinpatch2+23-1
Merge branch 'remote-ip' into 'develop'Haelwenn10+187-4
Merge branch 'split-masto-api/follow-requests' into 'develop'kaniini5+133-106
Merge branch 'split-masto-api/domain-blocks' into 'develop'kaniini5+80-57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'kaniini7+287-283
Merge branch 'split-masto-api/filters' into 'develop'kaniini5+214-195
Merge branch 'fix/subscription-notification-view' into 'develop'kaniini1+3-3
Merge branch 'refactor/status-controller' into 'develop'kaniini15+1469-1404
Merge branch 'refactor/subscription' into 'develop'kaniini14+708-9
Merge branch 'patch-2' into 'develop'kaniini1+28-5
Merge branch 'update/docs-jp' into 'develop'kaniini1+67-68
Merge branch 'list-packs-docs' into 'develop'kaniini1+9-0
Merge branch 'patch-1' into 'develop'kaniini1+1-0
Merge branch 'refactor/common_api' into 'develop'kaniini4+400-270
Merge branch 'refactor/timeline-controller' into 'develop'kaniini6+438-409
Merge branch 'chore/changelog-sync' into 'develop'rinpatch1+6-1
Merge branch 'feature/moderation-log-filters' into 'develop'feld8+343-105
Merge branch 'refactor/notification-controller' into 'develop'kaniini5+361-343
Merge branch 'feature/return-link-for-password-reset' into 'develop'kaniini4+19-3
Merge branch 'refactor/user' into 'develop'kaniini13+309-526
Merge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' into 'develop'kaniini8+29-9
Merge branch 'hex-flake-id' into 'develop'kaniini25+35-262
Merge branch 'feature/activities-pagination-by-offset' into 'develop'kaniini4+32-7
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'kaniini6+89-87
Merge branch 'hotfix/hackney-1.15.2' into 'develop'rinpatch1+2-2
Merge branch 'support/test' into 'develop'rinpatch1+10-1
Merge branch 'emoji-packs-create-dir' into 'develop'rinpatch4+104-39
Merge branch 'issue/1218' into 'develop'lain15+514-424
Merge branch 'feature/force-password-reset' into 'develop'kaniini12+147-0
Merge branch 'support-rel-ugc' into 'develop'kaniini12+58-46
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'kaniini4+21-3
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'kaniini5+448-210
Merge branch 'clean-up-views' into 'develop'kaniini8+81-42
Merge branch 'emoji-pack-json-pretty' into 'develop'kaniini1+1-1
Merge branch 'develop' into 'develop'rinpatch4+24-6
Merge branch 'update-adminfe/2019-09-23' into 'develop'rinpatch69+178-98
Merge branch 'better-emoji-packs' into 'develop'rinpatch19+1192-15
Merge branch 'config/update-mongoose' into 'develop'Haelwenn1+6-2
Merge branch 'conversation-docs' into 'develop'rinpatch1+2-1
Merge branch 'docs/clients-update' into 'develop'Haelwenn1+2-2
Merge branch 'outbox_pagination' into 'develop'lain2+25-1
Merge branch 'direct_conversation_id_on_status_creation' into 'develop'rinpatch3+10-2
Merge branch 'issue/733' into 'develop'Haelwenn4+68-67
Merge branch 'chores/bump-copyright-year' into 'develop'rinpatch95+95-95
Merge branch 'hide-follower-following-count' into 'develop'feld9+117-21
Merge branch 'admin_api_invite_tokens' into 'develop'feld5+54-44
Merge branch 'restore-tests' into 'develop'feld1+105-0
Merge branch 'chore/refetch-poll-changelog-update' into 'develop'rinpatch1+2-0
Merge branch 'fix/test-upload-cleanup' into 'develop'Haelwenn1+5-0
Merge branch 'feature/poll-refresh' into 'develop'Haelwenn10+186-13
Merge branch 'bugfix/docs-formatting' into 'develop'Haelwenn3+97-278
Merge branch 'chore/changelog-separate-1.1' into 'develop'Haelwenn1+62-30
Merge branch 'feature/bump-elixir-verstion' into 'develop'rinpatch2+2-1
Merge branch 'deps/update-tesla' into 'develop'feld2+2-2
Merge branch 'support/package_versions' into 'develop'rinpatch1+1-1
Merge branch 'feature/return-total-for-reports' into 'develop'rinpatch5+15-5
Merge branch 'fix-notification-warnings' into 'develop'rinpatch1+5-1
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'Haelwenn1+1-1
Merge branch 'support/tests' into 'develop'rinpatch4+341-119
Merge branch 'eliminate-test-errors' into 'develop'rinpatch3+62-25
Merge branch 'deps/update-oban' into 'develop'rinpatch4+17-6
Merge branch 'update-fields-limit' into 'develop'Haelwenn3+4-4
Merge branch 'fix/develop' into 'develop'rinpatch27+1361-920
Merge branch 'fix/signed-fetch-inclusion-test' into 'develop'rinpatch1+2-2
Merge branch 'revert-4fabf83a' into 'develop'kaniini27+920-1361
Merge branch 'streamer-refactoring' into 'develop'kaniini27+1361-920
Merge branch 'feature/delivery-tracking' into 'develop'kaniini10+287-6
Merge branch 'feature/optimize_rich_media_parser' into 'develop'kaniini3+7-3
Merge branch 'fix/race-in-tests' into 'develop'kaniini1+1-1
Merge branch '1149-oban-job-queue' into 'develop'rinpatch69+1784-1532
Merge branch 'config-changes' into 'develop'rinpatch4+705-5
Merge branch 'fix/truncate-remote-user-fields' into 'develop'rinpatch3+85-21
Merge branch 'fix-tests' into 'develop'rinpatch1+6-2
Merge branch 'security/fav-reblog-access-control' into 'develop'rinpatch3+56-2
Merge branch 'capture-test-errors' into 'develop'lain6+71-37
Merge branch 'refactor/add_link_headers' into 'develop'lain3+50-100
Merge branch 'cleanup-activity' into 'develop'lain6+159-268
Merge branch 'feature/change-email' into 'develop'Haelwenn7+176-2
Merge branch 'admin-config-description' into 'develop'rinpatch12+3107-714
Merge branch 'fix/admin-api-docs' into 'develop'kaniini1+7-3
Merge branch 'fix/error-log-double-quotes' into 'develop'Haelwenn2+3-3
Merge branch 'feature/jason-view-render' into 'develop'kaniini3+67-64
Merge branch 'patch-5' into 'develop'Haelwenn1+1-1
Merge branch 'fix/oom-parallel-rendering' into 'develop'lain3+23-35
Merge branch 'fix/tests' into 'develop'lain1+6-2
Merge branch 'statuses-by-ids' into 'develop'lain7+55-0
Merge branch 'cache-plug' into 'develop'feld11+457-7
Merge branch 'update-changelog' into 'develop'feld1+1-0
Merge branch 'fix/read-inbox' into 'develop'feld2+40-15
Merge branch 'chore/query-optimization' into 'develop'kaniini2+6-6
Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop'rinpatch1+6-5
Merge branch 'so-long-twitterapi' into 'develop'rinpatch20+79-5148
Merge branch 'update-frontend-e75ac9dd' into 'develop'rinpatch29+240-208
Merge branch 'hotifx/emoji-trailing' into 'develop'rinpatch1+2-1
Merge branch 'feature/mastoapi-accounts-external' into 'develop'Haelwenn5+131-24
Merge branch 'fix/endless-poll-handling' into 'develop'rinpatch6+46-11
Merge branch 'fix/safe-render-notifications' into 'develop'rinpatch2+2-1
Merge branch 'dockerfile-touchups' into 'develop'rinpatch2+3-3
Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'Haelwenn4+24-2
Merge branch 'feature/mastoapi-read-notifications' into 'develop'Haelwenn7+109-45
Merge branch 'feature/pagination-total' into 'develop'rinpatch3+97-0
Merge branch 'iss-930-media' into 'develop'feld1+7-7
Merge branch 'fix/antifollowbot-and-relays' into 'develop'kaniini2+9-4
Merge branch 'fix-osada-follow' into 'develop'Haelwenn6+87-2
Merge branch 'list-controller' into 'develop'lain24+2117-2018
Merge branch 'tests/activity_pub' into 'develop'lain8+299-123
Merge branch 'fix-typo' into 'develop'lain1+1-1
Merge branch 'fix/sporadic-test' into 'develop'rinpatch1+1-2
Merge branch 'disable-rate-limiter' into 'develop'kaniini2+3-10
Merge branch 'issue/1177' into 'develop'kaniini10+144-41
Merge branch 'feature/moderation-log' into 'develop'kaniini11+1187-41
Merge branch 'fix-all-custom-fields-deleted' into 'develop'kaniini2+12-2
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'lain3+24-33
Merge branch 'bugfix/log_non_implemented_mocks' into 'develop'rinpatch1+12-6
Merge branch 'admin-create-users' into 'develop'lain6+222-22
Merge branch 'activity-expiration' into 'develop'kaniini19+328-18
Merge branch 'fix-default-config-account_field' into 'develop'kaniini2+4-4
Merge branch 'fix/add-likes-index-objects' into 'develop'kaniini2+8-0
Merge branch 'support/tests' into 'develop'feld4+7-1
Merge branch 'improve-ap-routes-rate-limit' into 'develop'lain1+4-1
Merge branch 'rate-limit-ap-routes' into 'develop'lain3+6-2
Merge branch 'chore/fix-flakey-aws-test' into 'develop'kaniini1+2-1
Merge branch 'fix/admin-api-user-deletion' into 'develop'lain3+14-6
Merge branch 'digest-template' into 'develop'lain8+664-63
Merge branch 'feature/custom-fields' into 'develop'lain18+365-27
Merge branch 'fix/reverse-proxy-body-too-large' into 'develop'lain3+13-4
Merge branch 'tests/database-digest-tests' into 'develop'lain4+82-0
Merge branch 'support/test_helpers' into 'develop'lain40+210-417
Merge branch 'hotfix/user_unfollow' into 'develop'lain4+83-20
Merge branch 'chore/fix-ap-muted-tests' into 'develop'kaniini1+4-4
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'kaniini2+19-0
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'kaniini5+60-10
Merge branch 'pleroma-conversations' into 'develop'lain24+655-99
Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop'rinpatch1+0-1
Merge branch 'features/formatting-sub_sup' into 'develop'kaniini1+2-0
Merge branch 'feature/parallel-rendering' into 'develop'lain3+48-12
Merge branch 'cache-follow-state' into 'develop'lain5+58-6
Merge branch 'fix/stats-send-after' into 'develop'rinpatch1+1-1
Merge branch 'misc-otp-issues' into 'develop'rinpatch14+136-187
Merge branch 'fix/http-signatures-post' into 'develop'rinpatch2+3-1
Merge branch 'fix/mrf-describe-keyword-lists' into 'develop'rinpatch4+7-3
Merge branch 'fix/revert-tzdata-1.8' into 'develop'lain2+2-2
Merge branch 'backport/describe-api-changelog' into 'develop'rinpatch1+2-0
Merge branch 'preload-user-timelines' into 'develop'kaniini1+1-0
Merge branch 'get-context-optimizations' into 'develop'kaniini2+11-5
Merge branch 'feature/mrf-vocabulary' into 'develop'rinpatch5+169-0
Merge branch 'feature/mrf-describe' into 'develop'kaniini21+176-50
Merge branch 'length-limit-bio' into 'develop'rinpatch5+30-18
Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'Haelwenn3+46-12
Merge branch 'feature/nicer-safe-render-errors' into 'develop'kaniini1+2-2
Merge branch 'test/web_activity_pub_relay' into 'develop'kaniini2+76-3
Merge branch 'test/web_mastodon_api' into 'develop'kaniini4+243-65
Merge branch 'feature/remove-disable-blocks' into 'develop'kaniini4+3-6
Merge branch 'update/admin-fe' into 'develop'rinpatch31+88-78
Merge branch 'chore/changelog-update' into 'develop'rinpatch1+1-0
Merge branch 'fix/fix-type-depth' into 'develop'rinpatch1+6-4
Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'kaniini3+21-6
Merge branch 'fix/hide-follows-counters' into 'develop'kaniini3+37-2
Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop'kaniini5+98-40
Merge branch 'test/pleroma_uploaders' into 'develop'kaniini5+87-2
Merge branch 'fix/mastoapi-threadmute-detection' into 'develop'kaniini3+5-2
Merge branch 'feature/uploader_s3' into 'develop'rinpatch4+100-6
Merge branch 'feature/digest-email' into 'develop'lain33+660-17
Merge branch 'patch-3' into 'develop'rinpatch1+2-2
Merge branch 'fix/object-reembeds' into 'develop'Haelwenn6+7-26
Merge branch 'issue/1150' into 'develop'kaniini5+764-7
Merge branch 'test/common_api_utils.ex' into 'develop'kaniini2+276-43
Merge branch 'report-email-from-remote-user' into 'develop'kaniini3+15-2
Merge branch 'feature/relay-list-task' into 'develop'kaniini2+21-0
Merge branch 'fix/wrong-next-key-likes-json' into 'develop'kaniini3+55-6
Merge branch 'patch-2' into 'develop'kaniini1+1-1
Merge branch 'remove-longfox-emoji-set' into 'develop'kaniini30+3-28
Merge branch 'develop' into 'develop'kaniini2+3-3
Merge branch 'bugfix/password-reset-link-styling' into 'develop'kaniini1+5-0
Merge branch 'patch-2' into 'develop'kaniini1+1-1
Merge branch 'admin-fixes' into 'develop'kaniini4+52-5
Merge branch 'fix/search-space-error' into 'develop'kaniini2+13-1
Merge branch 'fix/with-reject-nil-clause' into 'develop'kaniini2+19-0
Merge branch 'official-docker-support' into 'develop'kaniini4+133-0
Merge branch 'docfix/mix_task_options' into 'develop'Haelwenn1+2-2
Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'feld4+51-56
Merge branch 'feature/hide-follows-remote' into 'develop'lain12+326-89
Merge branch 'fix/semver-violations' into 'develop'kaniini2+19-5
Merge branch 'cleanup-tests' into 'develop'rinpatch1+3-0
Merge branch 'chore/changelog-update' into 'develop'kaniini1+1-0
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'kaniini2+12-0
Merge branch 'test/web_common_api_utils' into 'develop'kaniini4+41-1
Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'kaniini6+63-11
Merge branch 'test/twitter/util_controller' into 'develop'kaniini4+505-95
Merge branch 'admin-changes' into 'develop'kaniini6+74-1
Merge branch 'security/remote-follow-commonapi' into 'develop'kaniini1+2-5
Merge branch 'revert-83508418' into 'develop'kaniini2+5-8
Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'Haelwenn2+8-5
Merge branch 'refactor/use-constants' into 'develop'lain28+107-90
Merge branch 'mailer-enabled-nodeinfo' into 'develop'kaniini2+2-0
Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'kaniini3+17-1
Merge branch 'tests/ostatus_controller' into 'develop'kaniini2+570-200
Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'kaniini3+60-14
Merge branch 'confirmation-resend' into 'develop'kaniini6+72-1
Merge branch 'fix/user_update_and_set_cache' into 'develop'kaniini2+25-1
Merge branch 'develop' into 'develop'kaniini1+1-1
Merge branch 'feature/hackney-303-redirect' into 'develop'kaniini1+1-0
Merge branch 'issue/1097' into 'develop'rinpatch3+81-65
Merge branch 'changelog/1484-base_url-remove-media' into 'develop'Haelwenn1+1-0
Merge branch 'tests/filter_dedupe' into 'develop'kaniini1+1-1
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'kaniini5+43-6
Merge branch 'fix/put-correct-activity-url' into 'develop'kaniini6+83-1
Merge branch 'fix/Upload_base_url' into 'develop'kaniini2+36-19
Merge branch 'tests/web_finger' into 'develop'kaniini7+141-24
Merge branch 'domain-blocking-relationship-api' into 'develop'kaniini4+28-10
Merge branch 'develop' into 'develop'lain2+24-0
Merge branch 'Fix-static-dir-doc' into 'develop'kaniini2+53-27
Merge branch 'feature/admin-api-user-statuses' into 'develop'kaniini7+110-6
Merge branch 'bugfix/rich-media-splice-url' into 'develop'kaniini4+17-13
Merge branch 'chore/update-mix-lock' into 'develop'kaniini1+4-4
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'kaniini1+0-13
Merge branch 'admin-config-fix' into 'develop'kaniini4+26-4
Merge branch 'tests/activity_pub_publisher' into 'develop'kaniini7+198-131
Merge branch 'bugfix/unauthed-liked-by' into 'develop'kaniini2+30-0
Merge branch 'patch-2' into 'develop'kaniini1+1-1
Merge branch 'fix/subscriber-notifications' into 'develop'kaniini2+29-0
Merge branch 'bugfix/http-signatures-misskey' into 'develop'Haelwenn2+27-9
Merge branch 'tests/skip-some-tests-on-mac' into 'develop'kaniini3+17-28
Merge branch 'changelog' into 'develop'kaniini1+3-0
Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'kaniini7+244-18
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'Haelwenn3+154-2
Merge branch 'bugfix/muted-user-notif-streaming' into 'develop'kaniini3+68-11
Merge branch 'tests/improve-test-coverage' into 'develop'kaniini5+139-44
Merge branch 'hide-blocked-from-interaction' into 'develop'kaniini2+44-2
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'kaniini2+3-2
Merge branch 'bugfix/sharedinbox-path-first' into 'develop'kaniini1+6-6
Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'kaniini2+2-1
Merge branch 'tests/mock-sha512-crypt' into 'develop'kaniini5+75-39
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'feld3+6-2
Merge branch 'feature/richmedia-ttl' into 'develop'kaniini8+222-1
Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'kaniini1+18-0
Merge branch 'refactor/http-signature-plug' into 'develop'kaniini8+153-50
Merge branch 'issue/1110' into 'develop'kaniini2+79-17
Merge branch 'patch-2' into 'develop'rinpatch1+3-3
Merge branch 'tests/authentication_plug' into 'develop'kaniini2+35-13
Merge branch 'feature/signed-object-fetches' into 'develop'kaniini6+80-6
Merge branch 'tests/uploads' into 'develop'kaniini5+147-15
Merge branch 'fix-howto_mediaproxy' into 'develop'kaniini1+3-1
Merge branch 'patch-2' into 'develop'kaniini1+1-0
Merge branch 'patch-3' into 'develop'kaniini1+8-0
Merge branch 'feature/instance-fetch-actor' into 'develop'kaniini11+103-17
Merge branch 'feature/http-signatures-keyid' into 'develop'kaniini4+22-11
Merge branch 'password-reset-fix-for-non-test-env' into 'develop'kaniini5+10-8
Merge branch 'feature/mention-mrf' into 'develop'kaniini4+121-0
Merge branch 'feature/1078-password-reset' into 'develop'kaniini8+90-6
Merge branch 'tests/upload_filters' into 'develop'kaniini7+186-29
Merge branch '1094-relation-actions-rate-limiting' into 'develop'kaniini3+12-0
Merge branch 'add-deactivated-to-account-view' into 'develop'kaniini4+16-0
Merge branch 'add-blocked-by-to-relationship' into 'develop'kaniini3+85-19
Merge branch 'feature/addressable-lists' into 'develop'kaniini1+1-1
Merge branch 'bugfix/poll-id-as-string' into 'develop'rinpatch3+3-3
Merge branch 'match-file-name' into 'develop'feld2+17-1
Merge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop'feld6+0-6
Merge branch 'tests/mastodon-common-api' into 'develop'kaniini6+289-50
Merge branch 'fix/1091-notifications-query' into 'develop'kaniini1+1-1
Merge branch 'sha512-crypt' into 'develop'kaniini4+21-6
Merge branch 'update-tzdata' into 'develop'kaniini2+4-3
Merge branch 'admin-configure-atom-keys' into 'develop'kaniini4+59-20
Merge branch 'tests/http_signature' into 'develop'kaniini4+116-24
Merge branch 'feature/addressable-lists' into 'develop'kaniini18+374-54
Merge branch 'tests/media_proxy' into 'develop'kaniini7+351-267
Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'kaniini3+17-1
Merge branch 'security/ir-generic-containment' into 'develop'kaniini5+46-0
Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'kaniini1+0-403
Merge branch 'bugfix/llal-object-containment' into 'develop'kaniini3+65-7
Merge branch 'feature/1072-muting-notifications' into 'develop'kaniini13+390-64
Merge branch 'rich_media_parsers_configurable' into 'develop'kaniini4+13-8
Merge branch 'feature/mrf-transparency-filter' into 'develop'kaniini5+51-1
Merge branch '1041-status-actions-rate-limit' into 'develop'kaniini6+155-27
Merge branch 'fix/hackney-global-options' into 'develop'Haelwenn5+8-7
Merge branch 'fix/ap-hide-follows' into 'develop'Haelwenn6+160-32
Merge branch 'tests/web_metadata' into 'develop'kaniini5+185-42
Merge branch 'fix/pleroma-extensions' into 'develop'kaniini4+17-18
Merge branch 'url-parser-proxy' into 'develop'kaniini2+5-18
Merge branch 'search-limit-offset-type' into 'develop'kaniini8+193-62
Merge branch 'admin-configure' into 'develop'kaniini7+665-274
Merge branch 'fix/1019-refactor' into 'develop'kaniini17+132-342
Merge branch 'chore/mailmap' into 'develop'kaniini1+2-0
Merge branch 'fix/1005-idna-domains' into 'develop'kaniini6+133-3
Merge branch 'features/mastoapi-emoji-categories' into 'develop'Haelwenn3+5-1
Merge branch 'feature/render-mentions-for-tags' into 'develop'kaniini4+73-5
Merge branch 'localization' into 'develop'kaniini31+1544-243
Merge branch 'tests/web/mastodon_api/search_controller' into 'develop'kaniini3+168-94
Merge branch 'hotfix/disable-email-changelog-fix' into 'develop'rinpatch1+12-13
Merge branch 'feature/disable_send_emails' into 'develop'kaniini10+200-8
Merge branch 'feature/send-delete-user-activity' into 'develop'kaniini6+152-34
Merge branch 'release/listener' into 'develop'kaniini4+105-71
Merge branch 'fix/license-attribution' into 'develop'kaniini64+256-0
Merge branch 'tests/mrf_policy' into 'develop'kaniini14+524-97
Merge branch '878-activity-object-decoupling-in-tests' into 'develop'rinpatch17+168-137
Merge branch 'docs/more-mastodon-api' into 'develop'kaniini2+9-1
Merge branch 'feature/allow-user-query-via-id' into 'develop'kaniini3+5-4
Merge branch 'remove-avatar-header' into 'develop'kaniini6+237-0
Merge branch 'fix/1019-correct-count-remote-users' into 'develop'kaniini16+564-7
Merge branch 'remove-swift' into 'develop'kaniini85+67-190
Merge branch 'test-coverage' into 'develop'kaniini13+901-386
Merge branch 'features/sec-websocket-protocol-header' into 'develop'kaniini3+21-4
Merge branch 'enable-ogp-by-default' into 'develop'Haelwenn5+26-2
Merge branch 'proxy-error' into 'develop'feld2+25-33
Merge branch 'test-speedup' into 'develop'Haelwenn9+70-10
Merge branch '161-incoming-replies-depth-limit' into 'develop'rinpatch11+187-83
Merge branch 'fix/966-local-user-search' into 'develop'lain2+36-1
Merge branch 'fix/relationships-in-statuses' into 'develop'Haelwenn3+38-2
Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'rinpatch1+1-1
Merge branch 'issue/1043' into 'develop'Haelwenn5+252-190
Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'rinpatch2+5-1
Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop'feld1+18-6
Merge branch 'handle-search-timeout' into 'develop'rinpatch2+15-4
Merge branch '1048-semver-format-compliance' into 'develop'Haelwenn2+31-22
Merge branch 'admin-report-view-user-fallback' into 'develop'kaniini2+19-1
Merge branch 'fix/changelog' into 'develop'rinpatch1+2-2
Merge branch 'fix/docs-dry-run' into 'develop'Haelwenn1+2-2
Merge branch 'ci-improvements' into 'develop'Haelwenn2+10-0
Merge branch 'chore/changelog-update' into 'develop'Haelwenn2+7-1
Merge branch 'issue/1033' into 'develop'feld70+151-103
Merge branch 'filter-user-statuses-by-hashtag' into 'develop'rinpatch3+19-0
Merge branch 'issues/1026' into 'develop'rinpatch5+58-6
Merge branch 'fix/pin-unlisted' into 'develop'Haelwenn3+9-2
Merge branch 'my-develop' into 'develop'rinpatch1+1-1
Merge branch 'revert/tags-releases-develop' into 'develop'rinpatch1+1-1
Merge branch 'fix/no-untagged-builds-master' into 'develop'rinpatch1+1-1
Merge branch 'fix/release-docs-path-warning' into 'develop'rinpatch1+2-0
Merge branch 'patch-3' into 'develop'rinpatch1+1-1
Merge branch 'patch-2' into 'develop'rinpatch1+1-1
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'kaniini4+100-28
Merge branch 'feature/mrf-mediaproxy-warm' into 'develop'kaniini4+106-0
Merge branch 'develop' into 'develop'rinpatch6+36-32
Merge branch 'release/1.0' into 'develop'lain2+2-2
Merge branch 'release-docs' into 'develop'lain9+494-23
Merge branch '2019-06-29-pleromafe' into 'develop'lain10+93-93
Merge branch 'fix/syslog-tag' into 'develop'kaniini2+2-1
Merge branch 'idempotency-plug' into 'develop'kaniini4+200-23
Merge branch 'fix/admin-configure' into 'develop'kaniini4+15-7
Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'rinpatch336+490-473
Merge branch 'fix/handle-wrong-visibility-error' into 'develop'Haelwenn3+171-167
Merge branch 'refactoring/fix_render_view' into 'develop'kaniini1+1-1
Merge branch 'feature/configurable-pack-extensions' into 'develop'kaniini4+7-2
Merge branch 'issues/1016' into 'develop'rinpatch8+102-30
Merge branch 'issues/184' into 'develop'kaniini16+205-123
Merge branch 'feature/rework-user-deletion' into 'develop'kaniini5+99-38
Merge branch 'conversation-update-on-dm-delete' into 'develop'kaniini2+124-1
Merge branch 'modify-config.md-for-S3' into 'develop'rinpatch1+7-0
Merge branch 'update/adminfe' into 'develop'feld24+87-72
Merge branch 'bind-to-localhost' into 'develop'kaniini2+2-0
Merge branch 'rich_media_titles_two' into 'develop'kaniini4+1552-8
Merge branch 'admin-config' into 'develop'kaniini13+400-70
Merge branch 'docs/remove-tootdon' into 'develop'Haelwenn1+0-7
Merge branch 'feature/rum-config-generator' into 'develop'Haelwenn3+20-2
Merge branch 'mix_sem_ver_version_fix' into 'develop'rinpatch1+1-1
Merge branch 'fix/ecto-tasks-release' into 'develop'rinpatch5+20-1
Merge branch 'bugfix/simple-notifications-for-non-create-activities' into 'develop'rinpatch1+8-2
Merge branch 'chore/update-bbcode' into 'develop'kaniini2+2-2
Merge branch 'fix/fallback-config' into 'develop'rinpatch1+1-1
Merge branch 'feature/mrf-anti-link-spam' into 'develop'kaniini4+190-0
Merge branch 'fix/use-config-when-possible' into 'develop'rinpatch1+5-1
Merge branch 'oauth_secure_redirect' into 'develop'kaniini2+153-43
Merge branch 'revert-6f5a0cc1' into 'develop'kaniini3+8-59
Merge branch 'fix-rate-limit-test' into 'develop'kaniini1+2-2
Merge branch 'move-sample-configs' into 'develop'rinpatch4+6-5
Merge branch 'fix/config-gen-releases' into 'develop'rinpatch13+207-187
Merge branch 'fix/dynamic-configuration' into 'develop'lain5+8-7
Merge branch 'feature/release-update-script' into 'develop'rinpatch4+123-29
Merge branch 'user_sign_out_mix_task' into 'develop'rinpatch1+19-0
Merge branch 'logger-level-for-migration-tasks' into 'develop'rinpatch7+210-7
Merge branch 'begone-the-dot-hack' into 'develop'rinpatch3+16-10
Merge branch 'fix/rich-media-hashtags-again' into 'develop'lain2+17-1
Merge branch 'update-frontend-c4fcdc71' into 'develop'lain41+565-216
Merge branch 'deps/update-auto-linker' into 'develop'lain4+7-3
Merge branch 'fix/mastoapi-sanitize-display-name' into 'develop'lain3+11-1
Merge branch 'feature/pleroma-ctl-rpc' into 'develop'Haelwenn1+11-4
Merge branch 'removing-test-errors' into 'develop'rinpatch4+38-4
Merge branch 'fix/sanitize-report-content' into 'develop'Haelwenn2+107-1
Merge branch 'issues/570' into 'develop'rinpatch6+130-31
Merge branch 'fix/991-version-generation' into 'develop'rinpatch1+14-2
Merge branch 'fix-for-new-isntances' into 'develop'lain1+2-1
Merge branch 'bugfix/980-polls-double-vote' into 'develop'lain1+15-1
Merge branch 'update/phoenix-and-plug' into 'develop'lain3+6-12
Merge branch '963_oob_oauth_redirect_fix' into 'develop'kaniini5+133-61
Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'rinpatch5+25-3
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'rinpatch7+332-274
Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'kaniini32+940-52
Merge branch 'fix-rate-limit-test' into 'develop'rinpatch1+1-1
Merge branch 'fix/hashtag-rich-media' into 'develop'lain2+54-1
Merge branch 'issues/948-account-search' into 'develop'lain8+300-181
Merge branch 'patch-2' into 'develop'lain1+4-0
Merge branch '986-document-how-to-disable-rate-limiting' into 'develop'lain1+9-2
Merge branch 'feature/ci-release-build' into 'develop'lain1+102-0
Merge branch 'release-move-out-application-dir' into 'develop'lain1+3-0
Merge branch 'fix/pleroma-ctl-shellcheck' into 'develop'rinpatch1+2-2
Merge branch 'remove-prometheus-nif' into 'develop'rinpatch2+0-2
Merge branch 'fix/ogp-title' into 'develop'lain3+59-8
Merge branch 'improve-410-handling' into 'develop'lain2+32-5
Merge branch 'release-config-import' into 'develop'lain1+15-0
Merge branch 'chore/tagpolicy_docs' into 'develop'lain1+1-0
Merge branch 'update_auto_linker' into 'develop'lain3+3-3
Merge branch 'remove-search-result-order' into 'develop'lain1+1-2
Merge branch 'improve-local-content-limit' into 'develop'kaniini7+58-38
Merge branch 'better-default-parameters-for-suggestion' into 'develop'lain2+5-5
Merge branch 'feature/rate-limiter' into 'develop'lain12+218-125
Merge branch 'update-plug' into 'develop'lain1+1-1
Merge branch 'change-containment-default' into 'develop'kaniini3+4-2
Merge branch 'preload-changes' into 'develop'kaniini2+5-2
Merge branch 'fix/warnings-in-migration' into 'develop'lain1+0-20
Merge branch 'feature/releases' into 'develop'lain13+213-57
Merge branch 'issue/media-proxy-whitelist' into 'develop'lain2+91-26
Merge branch 'prod-loglevel-warn' into 'develop'lain2+2-1
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'lain2+17-1
Merge branch 'bugfix/959-emoji-loading' into 'develop'rinpatch1+3-1
Merge branch 'fix/replace-mix-env' into 'develop'kaniini8+13-9
Merge branch 'fix/mix-tasks-ensure-no-endpoints-are-served' into 'develop'kaniini1+2-1
Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'kaniini1+120-85
Merge branch 'fix-search' into 'develop'rinpatch3+32-2
Merge branch 'improve-search' into 'develop'rinpatch7+72-10
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'kaniini9+143-35
Merge branch 'improve-search' into 'develop'kaniini10+305-178
Merge branch 'fix-stuck-follows' into 'develop'rinpatch4+120-60
Merge branch 'oauth_consumer_support_code' into 'develop'lain4+36-3
Merge branch 'explicit-addressing' into 'develop'kaniini9+191-12
Merge branch 'remove-tag-warning' into 'develop'Haelwenn1+2-1
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'Haelwenn2+14-0
Merge branch 'issue/941' into 'develop'lain17+249-40
Merge branch 'emoji-loader-fix' into 'develop'Haelwenn1+13-1
Merge branch 'fix/fetch-votes-restrict-create' into 'develop'lain3+54-7
Merge branch 'fix/poll-performance' into 'develop'kaniini1+1-1
Merge branch 'feature/nodeinfo-polls' into 'develop'kaniini1+2-0
Merge branch 'feature/mrf-subchain' into 'develop'kaniini6+95-2
Merge branch 'fix/mock-errors-in-tests' into 'develop'kaniini2+26-0
Merge branch 'generic-fe-settings' into 'develop'kaniini7+108-3
Merge branch 'ueberauth_config_extension' into 'develop'kaniini3+24-9
Merge branch 'update-oauth-template-css-fix' into 'develop'kaniini4+73-25
Merge branch 'hotfix/add-in_reply_to_index' into 'develop'kaniini1+7-0
Merge branch 'fix/tag-timeline-missing-index' into 'develop'lambda1+8-0
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'rinpatch21+1015-60
Merge branch 'fix-dokku' into 'develop'rinpatch1+1-2
Merge branch 'align-mastodon-conversations' into 'develop'lambda2+11-2
Merge branch 'chore/ci-speedup' into 'develop'rinpatch1+1-2
Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop'kaniini1+2-4
Merge branch 'feature/notification-control-part-2' into 'develop'kaniini8+84-42
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'kaniini2+7-0
Merge branch 'bugfix/remove-others-follower-collections' into 'develop'kaniini3+86-24
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'kaniini6+5-96
Merge branch 'add-missing-mock' into 'develop'kaniini1+2-0
Merge branch 'dokku' into 'develop'Haelwenn5+77-0
Merge branch 'doc/mongoose-im-config' into 'develop'feld1+932-0
Merge branch 'fix/mastodon-user-search' into 'develop'lambda1+1-1
Merge branch 'hotfix/leaking-lists' into 'develop'lambda5+88-17
Merge branch 'fix/install-guide' into 'develop'feld2+2-2
Merge branch 'fix/install-guide' into 'develop'feld9+9-9
Merge branch 'fix/ogp-missing-data' into 'develop'feld8+87-23
Merge branch 'use-pleroma-config' into 'develop'lambda18+78-149
Merge branch 'revert-57e58d26' into 'develop'kaniini1+6-14
Merge branch 'fix/mastodon-search-limit' into 'develop'lambda1+1-1
Merge branch 'issue/936' into 'develop'lambda1+96-80
Merge branch 'feature/search-authenticated-only' into 'develop'kaniini1+14-6
Merge branch 'varnish-improvements' into 'develop'feld1+35-35
Merge branch 'respect-proxy-settings-federation' into 'develop'kaniini1+2-0
Merge branch 'refactor/die-httpoison-die' into 'develop'lambda15+29-67
Merge branch 'fix/mrf-simple' into 'develop'kaniini3+20-2
Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'kaniini2+16-66
Merge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'kaniini2+7-5
Merge branch 'feature/static-headers' into 'develop'kaniini2+37-2
Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'lambda3+10-4
Merge branch 'feature/mrf-user-filter' into 'develop'kaniini7+133-9
Merge branch 'ssh-fixes' into 'develop'kaniini3+4-3
Merge branch 'fix/prune-objects-times-out' into 'develop'rinpatch1+1-1
Merge branch 'issue/699' into 'develop'lambda8+132-21
Merge branch 'feature/object-pruning' into 'develop'lambda7+97-3
Merge branch 'bring-ecto-back-to-mainline' into 'develop'lambda2+2-5
Merge branch 'refactor/keys' into 'develop'lambda14+133-124
Merge branch 'bugfix/account_view_source.note' into 'develop'rinpatch2+4-4
Merge branch 'mongooseim-support' into 'develop'kaniini6+118-0
Merge branch 'fix/api-fallback' into 'develop'kaniini4+62-2
Merge branch 'bugfix/dm-being-truncated' into 'develop'kaniini2+10-1
Merge branch 'trivial/increase-hackney-timeouts' into 'develop'kaniini2+2-1
Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'kaniini1+11-8
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'kaniini6+61-3
Merge branch 'feature/user-configurable-mascot' into 'develop'kaniini10+197-1
Merge branch 'doc/mrf-simple-report-removal' into 'develop'kaniini1+6-3
Merge branch 'feature/mrf-simple-report-filtering' into 'develop'kaniini3+41-1
Merge branch 'feature/mrf-always-nsfw' into 'develop'rinpatch6+50-5
Merge branch 'feature/http-ua-header-always' into 'develop'Haelwenn4+13-2
Merge branch 'rum-index' into 'develop'rinpatch6+105-12
Merge branch 'ecto_sql_update' into 'develop'lambda5+12-9
Merge branch 'update-tzdata' into 'develop'lambda1+1-1
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'lambda1+1-1
Merge branch 'fix/902-random-compile-failing' into 'develop'rinpatch15+36-35
Merge branch 'fix/mrf-tag-typo' into 'develop'kaniini3+194-2
Merge branch 'feature/890-add-report-uri' into 'develop'kaniini7+126-84
Merge branch 'feature/task-update-following' into 'develop'feld6+110-3
Merge branch 'feature/admin-api-reports' into 'develop'feld16+945-20
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'feld3+40-10
Merge branch 'conversations-import' into 'develop'rinpatch8+79-10
Merge branch 'feature/sql-thread-sat' into 'develop'lambda9+105-42
Merge branch 'feature/896-toggling-confirmation' into 'develop'rinpatch6+80-2
Merge branch 'docs/update_debian_instructions' into 'develop'kaniini2+4-2
Merge branch 'chore/docs-update' into 'develop'kaniini1+4-4
Merge branch 'fix/slow-federation' into 'develop'kaniini1+1-1
Merge branch 'fix/public-option-not-working' into 'develop'kaniini4+108-7
Merge branch 'chore/extricate-http-signatures' into 'develop'lambda11+49-309
Merge branch 'prevent-public-answers' into 'develop'kaniini6+81-41
Merge branch 'cleanup' into 'develop'lambda1+1-2
Merge branch 'ci/coverage' into 'develop'lambda3+5-1
Merge branch 'legacy-fe-config' into 'develop'rinpatch5+6-80
Merge branch 'fix/raise-registration-api-ratelimit' into 'develop'lambda3+9-7
Merge branch 'fix-the-build' into 'develop'lambda1+2-2
Merge branch 'fix/gopher' into 'develop'lambda1+3-3
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'lambda4+89-55
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'kaniini2+24-2
Merge branch 'refactor/oauth_controller_response' into 'develop'lambda4+136-64
Merge branch 'feature/disable-account' into 'develop'kaniini14+202-37
Merge branch 'changelog/adminfe' into 'develop'rinpatch1+1-0
Merge branch 'bump-mastoapi' into 'develop'kaniini1+1-1
Merge branch 'refactor/jason' into 'develop'kaniini6+13-13
Merge branch 'feature/federator-behaviours' into 'develop'lambda14+378-222
Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'kaniini27+476-66
Merge branch 'filter-irreversible' into 'develop'kaniini4+12-1
Merge branch 'mascot/pleroma-tan-shy' into 'develop'lambda2+8-0
Merge branch 'fix/unfollows-not-working' into 'develop'rinpatch2+39-1
Merge branch 'update-changelog' into 'develop'rinpatch1+1-0
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'kaniini2+23-28
Merge branch 'fix/readme-release' into 'develop'kaniini1+1-1
Merge branch 'uniform-admin-api-url' into 'develop'kaniini3+74-54
Merge branch 'feature/adminfe' into 'develop'Haelwenn63+831-1
Merge branch 'fix/retweet-language' into 'develop'lambda2+3-3
Merge branch 'improve/gitignore' into 'develop'Haelwenn1+4-0
Merge branch 'feature/761-add-users-filtration' into 'develop'kaniini10+551-256
Merge branch 'fix/851-emoji-redirect-follow' into 'develop'lambda1+12-4
Merge branch 'refactor/oauth_scopes' into 'develop'lambda5+86-35
Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'kaniini8+106-33
Merge branch 'docs/MRF-modules' into 'develop'kaniini14+28-3
Merge branch 'conversations_three' into 'develop'lambda16+710-34
Merge branch 'unused-config-parameter' into 'develop'rinpatch2+3-5
Merge branch 'fix/ex_doc-source-links' into 'develop'rinpatch1+3-3
Merge branch 'issue_800' into 'develop'lambda15+564-89
Merge branch 'feature/bbs' into 'develop'lambda8+275-2
Merge branch 'feature/845-improve-status-deletion' into 'develop'lambda9+40-21
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'rinpatch1+8-8
Merge branch 'fix-search-speed' into 'develop'rinpatch5+38-1
Merge branch 'bugfix/emoji-size' into 'develop'lambda16+139-32
Merge branch 'fix/replace-ws' into 'develop'lambda2+2-3
Merge branch 'iss-849' into 'develop'lambda3+32-1
Merge branch 'support/oauth' into 'develop'lambda5+96-40
Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop'rinpatch1+0-8
Merge branch 'features/download-mastofe-build' into 'develop'lambda1+45-0
Merge branch 'bugfix/web-notification-special-char' into 'develop'lambda2+32-5
Merge branch 'harmonize_return_types_in_user_module' into 'develop'lambda10+54-46
Merge branch 'docs/fix-config.md' into 'develop'rinpatch1+28-12
Merge branch 'update_auto_linker' into 'develop'rinpatch2+2-2
Merge branch 'fix/stream_out-normalize-only-creates' into 'develop'rinpatch1+2-1
Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop'rinpatch1+1-1
Merge branch 'fix-webpush' into 'develop'rinpatch2+57-39
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'rinpatch3+14-0
Merge branch 'fix/uploads-folder-issues' into 'develop'kaniini2+3-1
Merge branch 'regression/rights-only-for-admin' into 'develop'kaniini2+13-10
Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop'kaniini5+54-10
Merge branch 'feature/bbcode' into 'develop'kaniini5+41-1
Merge branch 'update/pleroma-fe-20190426' into 'develop'kaniini35+177-115
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'lambda10+182-56
Merge branch 'feature/mastoapi-new-config' into 'develop'kaniini9+234-110
Merge branch 'chore/update-changelog' into 'develop'kaniini1+3-0
Merge branch 'feature/mediaproxy-whitelist' into 'develop'kaniini4+43-20
Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop'Haelwenn2+50-4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'kaniini2+96-4
Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop'kaniini7+294-3
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'kaniini4+4-1
Merge branch 'fix/normalize-activities' into 'develop'kaniini6+7-7
Merge branch 'develop' into 'develop'kaniini2+10-0
Merge branch 'add-healthcheck-setting-to-config' into 'develop'kaniini3+10-3
Merge branch 'fix/emoji-task-docs' into 'develop'rinpatch1+4-4
Merge branch 'get-cached-everywhere' into 'develop'kaniini42+255-229
Merge branch 'feature/826-healthcheck-endpoint' into 'develop'kaniini7+120-0
Merge branch 'rework-emoji-management' into 'develop'kaniini144+423-128
Merge branch 'docs/posting_formatted' into 'develop'rinpatch1+1-0
Merge branch '923_oauth_controller_refactoring_p2' into 'develop'lambda2+36-10
Merge branch 'fix/mastoapi-status-view' into 'develop'kaniini4+19-7
Merge branch 'fix/follow-with-reblogs' into 'develop'kaniini4+67-16
Merge branch 'patch-1' into 'develop'kaniini1+1-0
Merge branch 'patch-2' into 'develop'Haelwenn1+296-0
Merge branch 'feature/database-compaction' into 'develop'kaniini37+762-577
Merge branch 'feature/805-server-rendered-rel-me-links' into 'develop'lambda6+38-3
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'lambda10+153-138
Merge branch 'bugfix/filter-boosted-blocks' into 'develop'Haelwenn2+29-0
Merge branch 'fix/mastoapi-search-unauth' into 'develop'kaniini2+8-1
Merge branch 'feature/improve-block-filtering' into 'develop'kaniini2+24-1
Merge branch '788-notify-email-changelog' into 'develop'rinpatch1+1-0
Merge branch 'feature/788-separate-email-addresses' into 'develop'kaniini12+133-17
Merge branch 'fix/remote-follow-auth' into 'develop'kaniini4+13-10
Merge branch 'bugfix/relax-spam-protection' into 'develop'Haelwenn3+40-4
Merge branch 'patch-2' into 'develop'kaniini1+22-0
Merge branch 'fix/follow-imports' into 'develop'kaniini2+21-1
Merge branch 'deps/bump-exdoc' into 'develop'rinpatch2+6-6
Merge branch 'remove-footguns' into 'develop'rinpatch2+39-1
Merge branch 'fix/status-reblogged' into 'develop'lambda2+44-7
Merge branch 'unfollow-oneself' into 'develop'lambda2+52-3
Merge branch 'refactor/remove-inReplyToStatusId' into 'develop'lambda10+56-42
Merge branch 'bugfix/registration-email-pattern' into 'develop'rinpatch1+2-0
Merge branch 'docs/archlinux-odbc' into 'develop'kaniini1+1-2
Merge branch 'docs/changelog' into 'develop'Haelwenn3+92-9
Merge branch 'improve-formatter' into 'develop'Haelwenn4+37-14
Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda15+39-22
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'lambda4+38-37
Merge branch 'fix/732-password-align' into 'develop'lambda2+21-9
Merge branch 'ssl_trusted_cert' into 'develop'lambda1+1-1
Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop'kaniini4+67-2
Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop'kaniini2+49-2
Merge branch 'fix/hackney_max_body_param' into 'develop'kaniini2+4-2
Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'lambda500+1915-65318
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'lambda14+996-105
Merge branch 'feature/user-status-subscriptions' into 'develop'lambda13+257-2
Merge branch 'fix/emoji-api-nonsense' into 'develop'lambda3+34-14
Merge branch 'hotfix/fix_undefined_summary' into 'develop'kaniini1+16-0
Merge branch 'notification-pleroma-settings' into 'develop'kaniini10+217-14
Merge branch 'mastoapi/plaintext-statuses' into 'develop'rinpatch3+32-7
Merge branch 'bugfix/follower_count' into 'develop'lambda2+19-0
Merge branch 'use-jobs-in-webpush' into 'develop'lambda6+21-45
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'lambda4+11-21
Merge branch 'twitter_oauth' into 'develop'lambda24+1047-121
Merge branch 'feature/697-language-tag-metadata' into 'develop'lambda2+16-1
Merge branch 'feature/770-add-emoji-tags' into 'develop'lambda15+270-28
Merge branch 'scheduled-activities' into 'develop'lambda17+788-10
Merge branch 'fix/deactivated-user-error' into 'develop'feld2+32-0
Merge branch 'fix/failed-legacy-test' into 'develop'feld1+10-8
Merge branch 'feature/prometheus' into 'develop'feld7+87-0
Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'Haelwenn3+90-6
Merge branch 'revert-8607ae68' into 'develop'rinpatch1+1-1
Merge branch 'test-coverage' into 'develop'rinpatch1+1-1
Merge branch 'feature/admin-api-follow' into 'develop'feld4+90-0
Merge branch 'hotfix/html-sanitization' into 'develop'lambda4+22-15
Merge branch 'feature/quack' into 'develop'feld4+28-3
Merge branch 'fix/add-oauth-token-indexes' into 'develop'lambda1+9-0
Merge branch 'features/pleroma-tan-mastofe' into 'develop'lambda1+2-1
Merge branch 'feature/robotstxt' into 'develop'lambda2+36-0
Merge branch 'update-autolinker' into 'develop'lambda2+2-2
Merge branch 'fix/preview-not-working-with-form-data' into 'develop'lambda2+2-2
Merge branch 'fix-slow-relationships' into 'develop'Haelwenn3+34-16
Merge branch 'bugfix/wrong-date-format' into 'develop'lambda2+46-2
Merge branch 'feature/fake-statuses' into 'develop'lambda7+141-27
Merge branch 'bugfix/share-mastodon' into 'develop'lambda6+503-16
Merge branch 'remove-user-activities' into 'develop'lambda4+51-16
Merge branch 'get_by_id' into 'develop'lambda8+19-40
Merge branch 'features/pleroma-tan' into 'develop'lambda7+878-0
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'lambda6+352-235
Merge branch 'get_by_id' into 'develop'lambda29+155-161
Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'lambda3+34-1
Merge branch 'ci-speedup-2-electric-boogalo' into 'develop'lambda1+33-35
Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop'rinpatch1+1-0
Merge branch 'fix/default-mail-adapter' into 'develop'lambda1+2-0
Merge branch 'documentation-improvements' into 'develop'lambda6+54-21
Merge branch 'update-readme' into 'develop'rinpatch1+5-3
Merge branch 'fix/job-queue-doc' into 'develop'lambda1+6-1
Merge branch 'pleroma_job_queue' into 'develop'lambda11+24-283
Merge branch 'sayonara-gitlab-wiki' into 'develop'lambda31+2444-149
Merge branch 'feature/deploy-docs' into 'develop'lambda1+37-0
Merge branch 'bugfix/migration-less_replies_count' into 'develop'kaniini1+0-48
Merge branch 'admin-api-user-show' into 'develop'lambda4+62-0
Merge branch 'feature/more-user-filters' into 'develop'lambda7+256-87
Merge branch 'fix-reblog-tests' into 'develop'lambda1+15-1
Merge branch 'hotfix/missing-announce-mastoapi' into 'develop'rinpatch1+7-2
Merge branch 'apps-verify-credentials' into 'develop'lambda4+103-10
Merge branch 'fix/ap-icon' into 'develop'lambda3+42-12
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'lambda2+24-0
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'lambda3+12-10
Merge branch 'replies-count' into 'develop'lambda6+235-1
Merge branch 'refactor/remove-activity-representer' into 'develop'lambda3+46-202
Merge branch 'fix/notification-id-index' into 'develop'rinpatch1+7-0
Merge branch 'bugfix/missing-announces' into 'develop'rinpatch2+24-6
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'kaniini1+9-4
Merge branch 'fix/mastoapi-liked' into 'develop'kaniini1+4-2
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'rinpatch1+18-5
Merge branch 'fix/eldap-warnings' into 'develop'rinpatch2+7-0
Merge branch 'feature/object-normalize-preload' into 'develop'kaniini17+223-52
Merge branch 'hotfix/null-content' into 'develop'rinpatch1+2-0
Merge branch 'safe-mentions' into 'develop'lambda2+26-0
Merge branch 'fix/use-union-all' into 'develop'kaniini2+18-5
Merge branch 'reports/fix-remote-reporting-emails' into 'develop'kaniini1+7-3
Merge branch 'safe-mentions' into 'develop'kaniini9+102-9
Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'kaniini10+71-58
Merge branch 'feature/move-search-to-db' into 'develop'kaniini1+39-44
Merge branch 'feature/gopher-dstport' into 'develop'rinpatch2+3-1
Merge branch 'ecto-3-migration' into 'develop'rinpatch16+41-32
Merge branch 'imageoptim' into 'develop'kaniini201+1-1
Merge branch '2019-03-20-update-frontend' into 'develop'lambda34+137-116
Merge branch 'fix/search-users-for-admin' into 'develop'kaniini2+25-15
Merge branch 'bugfix/activitypub-public' into 'develop'kaniini3+89-9
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'kaniini3+10-11
Merge branch 'doc/mastodon-api-accounts-extension' into 'develop'kaniini1+8-0
Merge branch 'masto-api-notifications' into 'develop'kaniini6+204-58
Merge branch 'fix-initial-posts' into 'develop'rinpatch1+4-1
Merge branch 'add-is-seen-mastodon-api-doc' into 'develop'rinpatch1+6-0
Merge branch 'feature/allow-link-rel-attribute' into 'develop'kaniini4+24-2
Merge branch 'feature/federated-flags' into 'develop'kaniini5+91-13
Merge branch 'feature/oauth-me' into 'develop'lambda2+7-3
Merge branch 'feature/reblog-muting' into 'develop'kaniini11+138-4
Merge branch 'bugfix/ldap-test-fix' into 'develop'kaniini1+5-3
Merge branch 'mark-notifications-as-read' into 'develop'kaniini5+62-0
Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'kaniini1+19-1
Merge branch 'feature/openldap-support' into 'develop'kaniini6+375-6
Merge branch 'enable-dedupe-by-default' into 'develop'kaniini2+2-2
Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop'kaniini3+9-3
Merge branch 'mastoapi/mime_type' into 'develop'Haelwenn3+10-2
Merge branch 'notifications-is-seen' into 'develop'kaniini4+179-50
Merge branch 'robotstxt' into 'develop'kaniini7+192-2
Merge branch 'fix/filename-mangling' into 'develop'kaniini7+70-6
Merge branch 'hotfix/delete-activities' into 'develop'rinpatch1+1-1
Merge branch 'admin-api-account-view-namespace' into 'develop'kaniini3+30-30
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'kaniini2+31-11
Merge branch 'mastofe-content-types' into 'develop'kaniini1+2-1
Merge branch 'unify-accept-reject-unfollow' into 'develop'kaniini4+42-46
Merge branch 'features/add-credo-to-ci' into 'develop'lambda123+381-353
Merge branch 'feature/add-roles-to-users-admin-api' into 'develop'kaniini3+30-10
Merge branch 'masto-api-followers-following' into 'develop'kaniini3+151-4
Merge branch 'add-screenname-extension-to-masto-api' into 'develop'kaniini3+18-3
Merge branch 'add-activity-id-to-push-messages' into 'develop'kaniini1+8-2
Merge branch 'ci-switch-to-elixir-1-8-1' into 'develop'rinpatch1+1-1
Merge branch 'add-local-field-to-status' into 'develop'lambda3+18-3
Merge branch 'feat/style-oauth-login-page' into 'develop'lambda2+130-45
Merge branch 'broadcast-activity-id-on-deletion' into 'develop'lambda6+40-14
Merge branch 'fix/roma-links-clients-md' into 'develop'lambda1+4-4
Merge branch 'patch-2' into 'develop'rinpatch1+6-6
Merge branch 'bugfix/tesla-safety' into 'develop'kaniini5+30-28
Merge branch 'fix-tlsv1.3' into 'develop'kaniini2+15-1
Merge branch 'delete-status' into 'develop'kaniini2+25-1
Merge branch 'fetch-posts-on-first-federation' into 'develop'kaniini5+149-10
Merge branch 'update-mastofe/glitch-soc-2019-03-07' into 'develop'kaniini331+489-461
Merge branch 'bugfix/mrf-antifollowbot-nil-bio' into 'develop'rinpatch2+24-3
Merge branch 'update/pleroma-fe-20190307' into 'develop'kaniini19+101-70
Merge branch 'bugfix/delete-activity-audience' into 'develop'rinpatch2+23-1
Merge branch 'preserve-link-headers' into 'develop'lambda2+37-0
Merge branch 'chore/merge-search-into-list-users' into 'develop'kaniini5+89-89
Merge branch 'bugfix/connect-src-https' into 'develop'kaniini1+6-3
Merge branch 'bugfix/rel-me_list' into 'develop'kaniini4+29-1
Merge branch 'feature/647' into 'develop'kaniini14+648-220
Merge branch 'features/masto_fe-config' into 'develop'kaniini2+4-1
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'Haelwenn2+9-6
Merge branch 'add-admin-to-node-info' into 'develop'rinpatch2+5-5
Merge branch 'bugfix/rich-media-uri-validation' into 'develop'Haelwenn2+76-0
Merge branch 'feature/add-status-text-to-notifications' into 'develop'kaniini6+98-23
Merge branch 'fix/like-adressing' into 'develop'kaniini2+72-3
Merge branch 'unify-follow' into 'develop'kaniini3+17-22
Merge branch 'dm-visibility-for-blocking-users' into 'develop'kaniini4+72-16
Merge branch 'muting' into 'develop'kaniini1+5-2
Merge branch 'remove-todo-txt' into 'develop'rinpatch1+0-12
Merge branch 'features/bio_rel_me' into 'develop'kaniini7+171-1
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'kaniini10+329-75
Merge branch 'get-follow-requests-sql' into 'develop'kaniini2+21-8
Merge branch 'atomic-note-count-updates' into 'develop'kaniini1+57-32
Merge branch 'count-only-public-statuses' into 'develop'kaniini3+94-2
Merge branch 'remove-follow-request-count' into 'develop'kaniini6+4-53
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'lambda4+54-1
Merge branch 'bugfix/oauth-scopes-join' into 'develop'rinpatch2+8-6
Merge branch 'hotfix/http-date-header' into 'develop'kaniini1+1-1
Merge branch 'default-tags-for-existing-users' into 'develop'kaniini1+9-0
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'lambda1+1-9
Merge branch 'feature/cowboy2' into 'develop'lambda4+31-31
Merge branch 'customizable_auth' into 'develop'href5+57-52
Merge branch 'with-mutes' into 'develop'kaniini10+58-287
Merge branch 'customizable_auth' into 'develop'href4+61-8
Merge branch 'speedup-follow-requests' into 'develop'kaniini2+17-2
Merge branch 'deactivated-in-user-view' into 'develop'kaniini2+14-0
Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'lambda2+73-4
Merge branch 'fix/formatter' into 'develop'kaniini3+20-4
Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'kaniini2+163-63
Merge branch 'auto_linker' into 'develop'kaniini10+213-292
Merge branch 'feature/more-actions-to-admin-api' into 'develop'kaniini4+39-0
Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'kaniini1+5-2
Merge branch 'nginx-cfg' into 'develop'Haelwenn1+2-2
Merge branch 'trivial/remove-io-inspect-spam' into 'develop'kaniini1+1-3
Merge branch 'add-apache-cache-config' into 'develop'kaniini1+18-0
Merge branch 'card-handling' into 'develop'kaniini12+195-72
Merge branch 'fix/meck' into 'develop'kaniini1+1-1
Merge branch 'oauth2_scopes_migration_hotfix' into 'develop'href1+11-0
Merge branch 'fix/twittercards' into 'develop'kaniini7+223-72
Merge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop'kaniini2+29-7
Merge branch 'bugfix/httpsig-sign-date' into 'develop'lambda3+11-2
Merge branch 'bugfix/as2-accept-json' into 'develop'lambda3+78-8
Merge branch '2019-02-21-update-frontend' into 'develop'lambda21+1053-77
Merge branch 'feature/improve-error-logging' into 'develop'lambda2+16-4
Merge branch 'feature/reports' into 'develop'kaniini18+347-5
Merge branch 'nicer-share-urls' into 'develop'kaniini2+9-2
Merge branch '468_oauth2_scopes' into 'develop'lambda24+735-219
Merge branch 'muting' into 'develop'lambda9+205-22
Merge branch 'set-activation-status-admin-api' into 'develop'kaniini4+65-0
Merge branch 'set-cache-on-user-tag-update' into 'develop'lambda1+1-1
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'lambda1+6-1
Merge branch 'fix/ap_id-unique_constraint' into 'develop'lambda1+1-0
Merge branch 'feature/jobs' into 'develop'kaniini16+370-152
Merge branch 'patch-image-description' into 'develop'kaniini2+18-2
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'kaniini6+109-1
Merge branch 'features/flavour-switching' into 'develop'kaniini6+95-5
Merge branch 'follow-request-count' into 'develop'kaniini9+91-18
Merge branch 'csv-export' into 'develop'kaniini2+12-1
Merge branch 'docs/add-clients-to-ex_doc' into 'develop'lambda1+1-0
Merge branch 'docker-speedup' into 'develop'lambda2+4-3
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'lambda3+19-2
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'lambda2+49-26
Merge branch 'welcome-message' into 'develop'rinpatch5+56-1
Merge branch 'bugfix/oauth-token-padding' into 'develop'lambda4+12-6
Merge branch 'hellthread-filter-fix' into 'develop'rinpatch3+113-23
Merge branch 'bugfix/actor-containment' into 'develop'rinpatch3+12-4
Merge branch 'bugfix/activitypub-reserialization' into 'develop'lambda2+67-7
Merge branch 'fix/mediaproxy-s3' into 'develop'href2+22-0
Merge branch 'fix/credo-issues-test' into 'develop'kaniini30+109-52
Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'Haelwenn2+36-14
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'kaniini4+68-8
Merge branch 'feature/better-login-errors' into 'develop'kaniini2+30-0
Merge branch 'mass-follow-fixes' into 'develop'rinpatch2+6-3
Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'kaniini1+2-0
Merge branch 'bugfix/mdii-uploader' into 'develop'kaniini1+1-1
Merge branch 'feature/csp_mastofe-dev' into 'develop'kaniini2+19-3
Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'Haelwenn1+2-2
Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'Haelwenn1+11-0
Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'kaniini2+138-22
Merge branch 'feature/thread-muting' into 'develop'rinpatch9+170-2
Merge branch 'feature/rich-media-limits' into 'develop'lambda1+8-1
Merge branch 'revert-e0de0fcf' into 'develop'lambda4+19-53
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'kaniini371+557-564
Merge branch 'feather_mention' into 'develop'kaniini1+4-0
Merge branch 'fix/credo-issues' into 'develop'kaniini73+396-227
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'kaniini2+6-5
Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'lambda1+5-4
Merge branch 'docs/pleroma-clients' into 'develop'lambda2+84-14
Merge branch 'object-creation' into 'develop'rinpatch4+53-19
Merge branch 'follow-enhancements' into 'develop'kaniini2+12-11
Merge branch 'add-media-path-to-caddy-cache' into 'develop'lambda1+5-0
Merge branch 'feature/keyword-policy' into 'develop'lambda5+222-0
Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'lambda1+3-3
Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'lambda1+5-4
Merge branch 'oauth2_strengthening' into 'develop'lambda2+9-9
Merge branch 'remove-pawoo-apps-from-readme' into 'develop'kaniini1+0-1
Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'kaniini1+3-3
Merge branch 'rename-followings' into 'develop'kaniini9+27-27
Merge branch 'bugfix/rich-media-card' into 'develop'Haelwenn2+59-2
Merge branch 'add-admin-and-moderator-fields' into 'develop'kaniini5+78-9
Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'Haelwenn2+21-1
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'rinpatch1+2-0
Merge branch '2019-02-06-update-frontend' into 'develop'lambda21+84-77
Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'rinpatch1+4-14
Merge branch 'fix-dm-index' into 'develop'kaniini2+31-1
Merge branch 'feature/ap-c2s-whoami' into 'develop'kaniini2+9-0
Merge branch 'testfix/twitter-api' into 'develop'kaniini1+1-1
Merge branch 'feature/split-hide-network-v2' into 'develop'kaniini10+90-45
Merge branch 'bugfix/rich-media-image-nil' into 'develop'kaniini2+7-2
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'lambda1+2-0
Merge branch 'patch-2' into 'develop'lambda1+1-0
Merge branch 'bugfix/rich-media-nil' into 'develop'lambda1+2-0
Merge branch 'feature/mrf-tag' into 'develop'Haelwenn2+173-0
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'rinpatch1+4-1
Merge branch 'mime-riff' into 'develop'kaniini1+9-1
Merge branch 'fix/rich-media-relative-path' into 'develop'rinpatch1+14-3
Merge branch 'feature/hellthread-filter-improvements' into 'develop'rinpatch4+47-11
Merge branch 'mogrify-orient' into 'develop'kaniini2+3-3
Merge branch '589-fix-cache' into 'develop'lambda8+51-19
Merge branch '582_federation_retirement_optimization' into 'develop'kaniini8+178-43
Merge branch 'fix/oauth-page-responsiveness' into 'develop'rinpatch1+2-1
Merge branch 'revert-0a82a7e6' into 'develop'kaniini10+45-88
Merge branch 'hotfix/object-normalize-cache' into 'develop'href1+2-2
Merge branch 'streaming-api-url-fix' into 'develop'href2+5-1
Merge branch 'develop' into 'develop'href3+85-8
Merge branch 'bugfix/get_list_return_404' into 'develop'Haelwenn1+4-1
More commits remaining [...]