akkoma
4 years agoMerge branch 'ensure-expiration-mix-task' into 'develop'
lain [Sat, 8 Aug 2020 15:16:55 +0000 (15:16 +0000)]
Merge branch 'ensure-expiration-mix-task' into 'develop'

Add mix task to add expiration to all local statuses

Closes #2020

See merge request pleroma/pleroma!2865

4 years agoAdd mix task to add expiration to all local statuses
Egor Kislitsyn [Sat, 8 Aug 2020 12:29:40 +0000 (16:29 +0400)]
Add mix task to add expiration to all local statuses

4 years agoMerge branch 'fix/ldap-auth-issues' into 'develop'
lain [Fri, 7 Aug 2020 20:59:44 +0000 (20:59 +0000)]
Merge branch 'fix/ldap-auth-issues' into 'develop'

Fix LDAP auth issues

Closes #1646

See merge request pleroma/pleroma!2852

4 years agoMerge branch 'develop' into fix/ldap-auth-issues
Mark Felder [Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)]
Merge branch 'develop' into fix/ldap-auth-issues

4 years agoMake a new function instead of overloading register_changeset/3
Mark Felder [Fri, 7 Aug 2020 19:54:14 +0000 (14:54 -0500)]
Make a new function instead of overloading register_changeset/3

4 years agoMerge branch 'authenticator-docs' into 'develop'
rinpatch [Fri, 7 Aug 2020 17:51:48 +0000 (17:51 +0000)]
Merge branch 'authenticator-docs' into 'develop'

Docs: Remove wrong / confusing auth docs.

Closes #2028

See merge request pleroma/pleroma!2860

4 years agoDocs: Remove wrong / confusing auth docs.
lain [Fri, 7 Aug 2020 15:59:55 +0000 (17:59 +0200)]
Docs: Remove wrong / confusing auth docs.

4 years agoMerge branch 'spoopy-user' into 'develop'
lain [Fri, 7 Aug 2020 14:51:26 +0000 (14:51 +0000)]
Merge branch 'spoopy-user' into 'develop'

restricted_nicknames: Add names from MastoAPI endpoints

See merge request pleroma/pleroma!2857

4 years agoAdd a note about the proper value for uid
Mark Felder [Fri, 7 Aug 2020 14:42:10 +0000 (09:42 -0500)]
Add a note about the proper value for uid

4 years agoMerge branch 'object-age-changelog' into 'develop'
rinpatch [Fri, 7 Aug 2020 14:21:28 +0000 (14:21 +0000)]
Merge branch 'object-age-changelog' into 'develop'

Changelog: Add information about the object age policy

See merge request pleroma/pleroma!2859

4 years agoChangelog: Add information about the object age policy
lain [Fri, 7 Aug 2020 14:20:13 +0000 (16:20 +0200)]
Changelog: Add information about the object age policy

4 years agoMerge branch 'features/poll-validation' into 'develop'
lain [Fri, 7 Aug 2020 10:44:06 +0000 (10:44 +0000)]
Merge branch 'features/poll-validation' into 'develop'

Poll and votes pipeline ingestion

Closes #1362 and #1852

See merge request pleroma/pleroma!2635

4 years agorestricted_nicknames: Add names from MastoAPI endpoints
Alex Gleason [Thu, 6 Aug 2020 23:01:29 +0000 (18:01 -0500)]
restricted_nicknames: Add names from MastoAPI endpoints

4 years agoMerge branch '2025-oauth-login-default-to-all-scopes' into 'develop'
lain [Thu, 6 Aug 2020 16:54:32 +0000 (16:54 +0000)]
Merge branch '2025-oauth-login-default-to-all-scopes' into 'develop'

[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes

Closes #2025

See merge request pleroma/pleroma!2855

4 years ago[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
Ivan Tashkinov [Thu, 6 Aug 2020 13:00:00 +0000 (16:00 +0300)]
[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.

4 years agoMerge branch 'whole-word-filter-hotfix' into 'develop'
lain [Thu, 6 Aug 2020 08:35:39 +0000 (08:35 +0000)]
Merge branch 'whole-word-filter-hotfix' into 'develop'

Update filter_view.ex to return whole_word actual value

See merge request pleroma/pleroma!2851

4 years agoMerge branch 'command-available-check' into 'develop'
lain [Thu, 6 Aug 2020 08:27:10 +0000 (08:27 +0000)]
Merge branch 'command-available-check' into 'develop'

#1939  Check command availability for exiftool and git

See merge request pleroma/pleroma!2753

4 years agochangelog for filter whole_word fix
Mary Kate [Wed, 5 Aug 2020 20:39:11 +0000 (15:39 -0500)]
changelog for filter whole_word fix

4 years agoupdate test for whole_word in filter
Mary Kate [Wed, 5 Aug 2020 20:36:25 +0000 (15:36 -0500)]
update test for whole_word in filter

4 years agoAdd note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pleroma...
Mark Felder [Wed, 5 Aug 2020 16:53:57 +0000 (11:53 -0500)]
Add note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pleroma.Web.Auth.PleromaAuthenticator

4 years agoComments are good when they're precise...
Mark Felder [Wed, 5 Aug 2020 16:40:09 +0000 (11:40 -0500)]
Comments are good when they're precise...

4 years agoMove checks to application startup
Roman Chvanikov [Wed, 5 Aug 2020 16:38:55 +0000 (19:38 +0300)]
Move checks to application startup

4 years agoAdd email to user account only if it exists in LDAP
Mark Felder [Wed, 5 Aug 2020 16:36:12 +0000 (11:36 -0500)]
Add email to user account only if it exists in LDAP

4 years agoMerge branch 'develop' into command-available-check
Roman Chvanikov [Wed, 5 Aug 2020 16:16:48 +0000 (19:16 +0300)]
Merge branch 'develop' into command-available-check

4 years agoMerge branch 'migrate-legacy-tags' into 'develop'
lain [Wed, 5 Aug 2020 16:03:11 +0000 (16:03 +0000)]
Merge branch 'migrate-legacy-tags' into 'develop'

Migrate legacy tags set by AdminFE to match TagPolicy, #2010

See merge request pleroma/pleroma!2836

4 years agoMerge branch 'refactor/config-get' into 'develop'
lain [Wed, 5 Aug 2020 15:59:30 +0000 (15:59 +0000)]
Merge branch 'refactor/config-get' into 'develop'

Refactor Pleroma.Config.get to return consistent results for nil values

Closes #2001

See merge request pleroma/pleroma!2853

4 years agoCommonValidations: More refactors.
lain [Wed, 5 Aug 2020 15:56:12 +0000 (17:56 +0200)]
CommonValidations: More refactors.

4 years agoCommonValidations: Refactor `same_domain?`
lain [Wed, 5 Aug 2020 15:36:27 +0000 (17:36 +0200)]
CommonValidations: Refactor `same_domain?`

4 years agoCommonValidations: Extract modification right checker
lain [Wed, 5 Aug 2020 15:26:53 +0000 (17:26 +0200)]
CommonValidations: Extract modification right checker

4 years agoMailerTest: Give it some time.
lain [Wed, 5 Aug 2020 15:26:03 +0000 (17:26 +0200)]
MailerTest: Give it some time.

4 years agoHandle non-list keys in Config.fetch/1
Roman Chvanikov [Wed, 5 Aug 2020 15:23:12 +0000 (18:23 +0300)]
Handle non-list keys in Config.fetch/1

4 years agoPermit LDAP users to register without capturing their password hash
Mark Felder [Wed, 5 Aug 2020 15:07:31 +0000 (10:07 -0500)]
Permit LDAP users to register without capturing their password hash
We don't need it, and local auth fallback has been removed.

4 years agoMerge branch 'develop' into refactor/config-get
Roman Chvanikov [Wed, 5 Aug 2020 14:46:24 +0000 (17:46 +0300)]
Merge branch 'develop' into refactor/config-get

4 years agoUpdate clear_config macro
Roman Chvanikov [Wed, 5 Aug 2020 14:46:14 +0000 (17:46 +0300)]
Update clear_config macro

4 years agoDefine default authenticator in the config
Mark Felder [Wed, 5 Aug 2020 14:41:17 +0000 (09:41 -0500)]
Define default authenticator in the config

4 years agoFix linting.
lain [Wed, 5 Aug 2020 13:40:32 +0000 (15:40 +0200)]
Fix linting.

4 years agoRemove fallback to local database when LDAP is unavailable.
Mark Felder [Wed, 5 Aug 2020 13:18:16 +0000 (08:18 -0500)]
Remove fallback to local database when LDAP is unavailable.

In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.

4 years agoRemove LDAP mail attribute as a requirement for registering an account
Mark Felder [Wed, 5 Aug 2020 13:15:57 +0000 (08:15 -0500)]
Remove LDAP mail attribute as a requirement for registering an account

4 years agoQuestions: Move fixes to validators.
lain [Wed, 5 Aug 2020 12:51:33 +0000 (14:51 +0200)]
Questions: Move fixes to validators.

4 years agoApply 1 suggestion(s) to 1 file(s)
lain [Wed, 5 Aug 2020 11:33:21 +0000 (11:33 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoApply 1 suggestion(s) to 1 file(s)
lain [Wed, 5 Aug 2020 11:14:58 +0000 (11:14 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoCommonValidations: Remove superfluous function
lain [Wed, 5 Aug 2020 10:24:34 +0000 (12:24 +0200)]
CommonValidations: Remove superfluous function

The `is_active` functionality was integrated into the presence
checker.

4 years agoRefactor config
Roman Chvanikov [Wed, 5 Aug 2020 10:00:49 +0000 (13:00 +0300)]
Refactor config

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-valid...
lain [Wed, 5 Aug 2020 09:12:14 +0000 (11:12 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation

4 years agoMerge branch 'unique-app-id' into 'develop'
lain [Wed, 5 Aug 2020 09:08:50 +0000 (09:08 +0000)]
Merge branch 'unique-app-id' into 'develop'

Add unique index for apps.client_id, fixes #2022

Closes #2022

See merge request pleroma/pleroma!2844

4 years agoMerge branch 'fix/incorrect-expirations' into 'develop'
lain [Wed, 5 Aug 2020 08:55:39 +0000 (08:55 +0000)]
Merge branch 'fix/incorrect-expirations' into 'develop'

Add a migration to clean up activity_expirations table

See merge request pleroma/pleroma!2848

4 years agoMerge branch 'fix-link-color' into 'develop'
lain [Wed, 5 Aug 2020 08:11:58 +0000 (08:11 +0000)]
Merge branch 'fix-link-color' into 'develop'

templates/layout/app.html.eex: fix link color

See merge request pleroma/pleroma!2850

4 years agoUpdate filter_view.ex to return whole_word actual value
MK Fain [Wed, 5 Aug 2020 02:01:27 +0000 (02:01 +0000)]
Update filter_view.ex to return whole_word actual value

4 years agotemplates/layout/app.html.eex: fix link color
Karol Kosek [Tue, 4 Aug 2020 22:01:30 +0000 (00:01 +0200)]
templates/layout/app.html.eex: fix link color

4 years agoAdd a migration to clean up activity_expirations table
Mark Felder [Tue, 4 Aug 2020 18:12:23 +0000 (13:12 -0500)]
Add a migration to clean up activity_expirations table

4 years agoMerge branch 'deactivated-user-posts' into 'develop'
rinpatch [Tue, 4 Aug 2020 19:17:30 +0000 (19:17 +0000)]
Merge branch 'deactivated-user-posts' into 'develop'

Deactivated user posts

Closes #2011

See merge request pleroma/pleroma!2845

4 years agoMerge branch 'chore/consolidate-rich-media-http' into 'develop'
rinpatch [Tue, 4 Aug 2020 19:16:38 +0000 (19:16 +0000)]
Merge branch 'chore/consolidate-rich-media-http' into 'develop'

Consolidate construction of Rich Media Parser HTTP requests

See merge request pleroma/pleroma!2827

4 years agoUnique apps.client_id for new installations, fixes #2022
Alex Gleason [Tue, 4 Aug 2020 03:32:51 +0000 (22:32 -0500)]
Unique apps.client_id for new installations, fixes #2022

4 years agoMerge branch 'fix/activity-expiration-policy' into 'develop'
lain [Tue, 4 Aug 2020 16:30:09 +0000 (16:30 +0000)]
Merge branch 'fix/activity-expiration-policy' into 'develop'

Fix ActivityExpirationPolicy

Closes #2019

See merge request pleroma/pleroma!2847

4 years agoFix ActivityExpirationPolicy
Egor Kislitsyn [Tue, 4 Aug 2020 14:26:37 +0000 (18:26 +0400)]
Fix ActivityExpirationPolicy

4 years agoMerge branch 'chore/credo-alias' into 'develop'
lain [Tue, 4 Aug 2020 14:09:23 +0000 (14:09 +0000)]
Merge branch 'chore/credo-alias' into 'develop'

Add a simple credo mix alias to run the same checks we use in CI

See merge request pleroma/pleroma!2846

4 years agoAdd analyze mix alias to run the same credo checks we use in CI
Mark Felder [Tue, 4 Aug 2020 13:55:40 +0000 (08:55 -0500)]
Add analyze mix alias to run the same credo checks we use in CI

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-valid...
lain [Tue, 4 Aug 2020 13:28:41 +0000 (15:28 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation

4 years agoMastodonAPITest: Do the needful
lain [Tue, 4 Aug 2020 13:08:51 +0000 (15:08 +0200)]
MastodonAPITest: Do the needful

4 years agoquestion_validator: Allow content to be an empty-string (blank)
Haelwenn (lanodan) Monnier [Tue, 4 Aug 2020 12:23:35 +0000 (14:23 +0200)]
question_validator: Allow content to be an empty-string (blank)

4 years agoCommonValidations: Treat deactivated users as not present.
lain [Tue, 4 Aug 2020 12:17:03 +0000 (14:17 +0200)]
CommonValidations: Treat deactivated users as not present.

4 years agoTransmogrifierTest: Add test for deactivated users
lain [Tue, 4 Aug 2020 12:15:32 +0000 (14:15 +0200)]
TransmogrifierTest: Add test for deactivated users

4 years agoCommonAPITest: Add test that deactivated users can't post.
lain [Tue, 4 Aug 2020 12:08:12 +0000 (14:08 +0200)]
CommonAPITest: Add test that deactivated users can't post.

4 years agoTest Config: Don't have any MRFs by default
lain [Tue, 4 Aug 2020 12:07:10 +0000 (14:07 +0200)]
Test Config: Don't have any MRFs by default

4 years agoApp Test: Make more resilient
lain [Tue, 4 Aug 2020 11:38:30 +0000 (13:38 +0200)]
App Test: Make more resilient

4 years agoUnify Config.get behaviour for atom/list key param
Roman Chvanikov [Tue, 4 Aug 2020 11:35:47 +0000 (14:35 +0300)]
Unify Config.get behaviour for atom/list key param

4 years agoMerge branch 'email-blacklist' into 'develop'
lain [Tue, 4 Aug 2020 11:00:30 +0000 (11:00 +0000)]
Merge branch 'email-blacklist' into 'develop'

Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837

4 years agoChangelog: Add info about email blacklist
lain [Tue, 4 Aug 2020 10:49:56 +0000 (12:49 +0200)]
Changelog: Add info about email blacklist

4 years agoEmail blacklist: Update phrasing again
Alex Gleason [Tue, 4 Aug 2020 03:20:49 +0000 (22:20 -0500)]
Email blacklist: Update phrasing again

4 years agoEmail blacklist: Update response phrasing
Alex Gleason [Tue, 4 Aug 2020 00:57:53 +0000 (19:57 -0500)]
Email blacklist: Update response phrasing

4 years agoMerge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into...
lain [Mon, 3 Aug 2020 21:01:56 +0000 (21:01 +0000)]
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'

fixes 1957 Add option to send user chatmessage instead of dm

Closes #1957

See merge request pleroma/pleroma!2782

4 years agoImproved WelcomeChatMessageTest
Ilja [Mon, 3 Aug 2020 18:13:43 +0000 (20:13 +0200)]
Improved WelcomeChatMessageTest

* Checks if message is the same using ==/2 instead of =~/2

4 years agoConsolidate construction of Rich Media Parser HTTP requests
Mark Felder [Mon, 3 Aug 2020 17:37:31 +0000 (12:37 -0500)]
Consolidate construction of Rich Media Parser HTTP requests

4 years agoApply 1 suggestion(s) to 1 file(s)
Ilja [Mon, 3 Aug 2020 16:44:56 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoMerge branch 'follower-mrf-again' into 'develop'
lain [Mon, 3 Aug 2020 14:22:11 +0000 (14:22 +0000)]
Merge branch 'follower-mrf-again' into 'develop'

Follower mrf again

See merge request pleroma/pleroma!2833

4 years agoAccountControllerTest: Add test for message returned.
lain [Mon, 3 Aug 2020 13:00:14 +0000 (15:00 +0200)]
AccountControllerTest: Add test for message returned.

4 years agoMerge branch 'config/default_ok_oldage' into 'develop'
lain [Mon, 3 Aug 2020 12:50:29 +0000 (12:50 +0000)]
Merge branch 'config/default_ok_oldage' into 'develop'

config: :mrf, :policies default to ObjectAgePolicy

Closes #2000

See merge request pleroma/pleroma!2814

4 years agoMerge branch 'object-age-fix' into 'develop'
lain [Mon, 3 Aug 2020 12:50:10 +0000 (12:50 +0000)]
Merge branch 'object-age-fix' into 'develop'

MRF Object Age Policy: Don't break on messages without cc/to

See merge request pleroma/pleroma!2840

4 years agoMRF Object Age Policy: Don't break on messages without cc/to
lain [Mon, 3 Aug 2020 12:12:32 +0000 (14:12 +0200)]
MRF Object Age Policy: Don't break on messages without cc/to

4 years agoMerge branch 'indigenous-client' into 'develop'
lain [Mon, 3 Aug 2020 11:37:55 +0000 (11:37 +0000)]
Merge branch 'indigenous-client' into 'develop'

Add indigenous to clients

See merge request pleroma/pleroma!2835

4 years agoMerge branch 'reportnote-test' into 'develop'
lain [Mon, 3 Aug 2020 09:55:56 +0000 (09:55 +0000)]
Merge branch 'reportnote-test' into 'develop'

ReportNote test

Closes #2014

See merge request pleroma/pleroma!2839

4 years agoAdd ReportNote test
Alex Gleason [Sun, 2 Aug 2020 21:37:33 +0000 (16:37 -0500)]
Add ReportNote test

4 years agoFactory: Add report_activity_factory
Alex Gleason [Sun, 2 Aug 2020 21:36:55 +0000 (16:36 -0500)]
Factory: Add report_activity_factory

4 years agoAdd email blacklist, fixes #1404
Alex Gleason [Sun, 2 Aug 2020 19:53:42 +0000 (14:53 -0500)]
Add email blacklist, fixes #1404

4 years agoMigrate legacy tags set by AdminFE to match TagPolicy, #2010
Alex Gleason [Sun, 2 Aug 2020 18:42:23 +0000 (13:42 -0500)]
Migrate legacy tags set by AdminFE to match TagPolicy, #2010

4 years agoAdd indigenous to clients
swentel [Sun, 2 Aug 2020 17:33:22 +0000 (19:33 +0200)]
Add indigenous to clients

4 years agoAdd welcome chatmessages
Ilja [Sun, 2 Aug 2020 13:54:59 +0000 (15:54 +0200)]
Add welcome chatmessages

* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md

4 years agoSimpleMRF: Add missing :followers_only to config.exs
Alex Gleason [Sat, 1 Aug 2020 21:08:29 +0000 (16:08 -0500)]
SimpleMRF: Add missing :followers_only to config.exs

4 years agoMerge branch '1985-unobtrusive-autologin-on-registration' into 'develop'
lain [Sat, 1 Aug 2020 15:58:17 +0000 (15:58 +0000)]
Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'

[#1985] Prevented force login on registration if account approval and/or email confirmation needed

Closes #1985

See merge request pleroma/pleroma!2823

4 years agoMerge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'
rinpatch [Sat, 1 Aug 2020 15:17:41 +0000 (15:17 +0000)]
Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'

ConnectionPool: fix gun open errors being returned without an error tuple

Closes #2008

See merge request pleroma/pleroma!2832

4 years agoConnectionPool: fix gun open errors being returned without an error tuple
rinpatch [Sat, 1 Aug 2020 14:59:50 +0000 (17:59 +0300)]
ConnectionPool: fix gun open errors being returned without an error tuple

When gun shuts down due to the host being unreachable, the worker
process shuts down with the same shutdown reason since they are linked.
Gun doesn't have error tuples in it's shutdown reason though, so we need
to handle it in get_conn.

Closes #2008

4 years agoMerge branch 'fix/gun-limiter' into 'develop'
rinpatch [Sat, 1 Aug 2020 10:49:35 +0000 (10:49 +0000)]
Merge branch 'fix/gun-limiter' into 'develop'

Fix ConnecitonPool deadlocking after reaching the connection limit

Closes #1977

See merge request pleroma/pleroma!2830

4 years agoFix ConnecitonPool deadlocking after reaching the connection limit
rinpatch [Sat, 1 Aug 2020 09:16:06 +0000 (12:16 +0300)]
Fix ConnecitonPool deadlocking after reaching the connection limit

The issue was with ConcurrentLimiter not decrementing counters on
overload. It was fixed in the latest commit, but concurrentlimiter
version wasn't updated in Pleroma for some reason.

Closes #1977

4 years agoMerge branch 'fix/user-agent-overriding' into 'develop'
rinpatch [Sat, 1 Aug 2020 07:25:32 +0000 (07:25 +0000)]
Merge branch 'fix/user-agent-overriding' into 'develop'

Don't override user-agent header if it's been set

Closes #1923

See merge request pleroma/pleroma!2829

4 years agoDon't override user-agent header if it's been set
Roman Chvanikov [Sat, 1 Aug 2020 07:04:25 +0000 (10:04 +0300)]
Don't override user-agent header if it's been set

4 years agoRevert "Merge branch 'revert-1ac0969c' into 'develop'"
lain [Fri, 31 Jul 2020 15:18:04 +0000 (15:18 +0000)]
Revert "Merge branch 'revert-1ac0969c' into 'develop'"

This reverts merge request !2825

4 years agoMerge branch 'revert-1ac0969c' into 'develop'
lain [Fri, 31 Jul 2020 15:17:33 +0000 (15:17 +0000)]
Merge branch 'revert-1ac0969c' into 'develop'

Revert "Merge branch 'mrf-silence-2' into 'develop'"

See merge request pleroma/pleroma!2825

4 years agoRevert "Merge branch 'mrf-silence-2' into 'develop'"
lain [Fri, 31 Jul 2020 15:17:09 +0000 (15:17 +0000)]
Revert "Merge branch 'mrf-silence-2' into 'develop'"

This reverts merge request !2820

4 years agoMerge branch 'mrf-silence-2' into 'develop'
lain [Fri, 31 Jul 2020 14:43:33 +0000 (14:43 +0000)]
Merge branch 'mrf-silence-2' into 'develop'

MRF silencing alternative solution

See merge request pleroma/pleroma!2820

4 years agoMerge remote-tracking branch 'pleroma/develop' into features/poll-validation
Haelwenn (lanodan) Monnier [Fri, 31 Jul 2020 11:57:21 +0000 (13:57 +0200)]
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation