akkoma
3 years agoMerge branch 'fix/copy-emoji-summary' into 'develop'
Haelwenn [Tue, 23 Mar 2021 09:27:03 +0000 (09:27 +0000)]
Merge branch 'fix/copy-emoji-summary' into 'develop'

Copy emoji in the subject from parent post

See merge request pleroma/pleroma!3378

3 years agoCopy emoji in the subject from parent post
rinpatch [Mon, 22 Mar 2021 17:07:07 +0000 (20:07 +0300)]
Copy emoji in the subject from parent post

Sometimes people put emoji in the subject, which results in the subject
looking broken if someone replies to it from a server that does not
have the said emoji under the same shortcode. This patch solves the problem
by extending the emoji set available in the summary to that of the parent
post.

3 years agoMerge branch 'fix/2579-finger-content-type' into 'develop'
rinpatch [Sun, 21 Mar 2021 08:25:02 +0000 (08:25 +0000)]
Merge branch 'fix/2579-finger-content-type' into 'develop'

respect content-type header in finger request

Closes #2579

See merge request pleroma/pleroma!3375

3 years agoMerge branch 'richmedia-workaround' into 'develop'
rinpatch [Sun, 21 Mar 2021 08:19:42 +0000 (08:19 +0000)]
Merge branch 'richmedia-workaround' into 'develop'

Workaround for RichMedia preview image breakage edge case

See merge request pleroma/pleroma!3363

3 years agoMerge branch 'fix/timex-retired-version' into 'develop'
feld [Sat, 20 Mar 2021 15:52:01 +0000 (15:52 +0000)]
Merge branch 'fix/timex-retired-version' into 'develop'

updating Timex

See merge request pleroma/pleroma!3377

3 years agoupdating timex
Alexander Strizhakov [Sat, 20 Mar 2021 05:29:02 +0000 (08:29 +0300)]
updating timex

3 years agorespect content-type header in finger request
Alexander Strizhakov [Thu, 18 Mar 2021 10:49:03 +0000 (13:49 +0300)]
respect content-type header in finger request

3 years agoMerge branch 'mediaproxy-decode' into 'develop'
rinpatch [Fri, 19 Mar 2021 08:52:12 +0000 (08:52 +0000)]
Merge branch 'mediaproxy-decode' into 'develop'

Simple way to decode mediaproxy URLs

See merge request pleroma/pleroma!3364

3 years agoMerge branch 'fix/remove_auto_nsfw' into 'develop'
rinpatch [Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)]
Merge branch 'fix/remove_auto_nsfw' into 'develop'

Remove sensitive setting #nsfw

See merge request pleroma/pleroma!3223

3 years agoMerge branch 'bugfix/bridgy-user-icon' into 'develop'
rinpatch [Fri, 19 Mar 2021 08:36:26 +0000 (08:36 +0000)]
Merge branch 'bugfix/bridgy-user-icon' into 'develop'

Add support for actor icon being a list (Bridgy)

See merge request pleroma/pleroma!3372

3 years agoMerge branch 'update_open_api_spex' into 'develop'
Haelwenn [Tue, 16 Mar 2021 01:54:43 +0000 (01:54 +0000)]
Merge branch 'update_open_api_spex' into 'develop'

Update OpenApiSpex dependency

See merge request pleroma/pleroma!3362

3 years agoMerge branch 'feature/object-hashtags-rework' into 'develop'
rinpatch [Mon, 15 Mar 2021 09:35:46 +0000 (09:35 +0000)]
Merge branch 'feature/object-hashtags-rework' into 'develop'

Hashtags extraction from objects. Background migration infrastructure.

Closes #1840 and #2455

See merge request pleroma/pleroma!3213

3 years agoAdd support for actor icon being a list (Bridgy)
Haelwenn (lanodan) Monnier [Mon, 15 Mar 2021 05:43:12 +0000 (06:43 +0100)]
Add support for actor icon being a list (Bridgy)

3 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
Haelwenn [Sun, 14 Mar 2021 08:09:22 +0000 (08:09 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!3370

3 years agoPrefer naming this function build_image_url/2
Mark Felder [Sat, 13 Mar 2021 18:27:15 +0000 (12:27 -0600)]
Prefer naming this function build_image_url/2

3 years agoTranslated using Weblate (Italian)
Ben Is [Thu, 11 Mar 2021 13:51:22 +0000 (13:51 +0000)]
Translated using Weblate (Italian)

Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/

3 years ago[#3213] Code formatting fix.
Ivan Tashkinov [Fri, 12 Mar 2021 09:25:18 +0000 (12:25 +0300)]
[#3213] Code formatting fix.

3 years ago[#3213] Background migration infrastructure refactoring.
Ivan Tashkinov [Fri, 12 Mar 2021 09:18:11 +0000 (12:18 +0300)]
[#3213] Background migration infrastructure refactoring.
Extracted BaseMigrator and BaseMigratorState.

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Fri, 12 Mar 2021 05:49:25 +0000 (08:49 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

3 years agoMerge branch 'improve-gitlab-ci' into 'develop'
rinpatch [Thu, 11 Mar 2021 19:14:59 +0000 (19:14 +0000)]
Merge branch 'improve-gitlab-ci' into 'develop'

Execute mix deps.get earlier and avoid duplicate invocations if possible

See merge request pleroma/pleroma!3369

3 years agoExecute mix deps.get earlier and avoid duplicate invocations if possible
Mark Felder [Thu, 11 Mar 2021 15:40:40 +0000 (09:40 -0600)]
Execute mix deps.get earlier and avoid duplicate invocations if possible

3 years agoLeverage function pattern matching instead
Mark Felder [Thu, 11 Mar 2021 15:20:29 +0000 (09:20 -0600)]
Leverage function pattern matching instead

3 years agoWorkaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771
Mark Felder [Sat, 6 Mar 2021 18:02:32 +0000 (12:02 -0600)]
Workaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771

If we avoid URI.merge unless we know we need it we reduce the edge cases we could encounter.
The site would need to both have "//" in the %URI{:path} and the image needs to be a relative URL.

3 years agoMerge branch 'fix/spec-build' into 'develop'
feld [Wed, 10 Mar 2021 23:14:46 +0000 (23:14 +0000)]
Merge branch 'fix/spec-build' into 'develop'

Ensure we fetch deps during spec-build stage

See merge request pleroma/pleroma!3368

3 years agoRevert "See if switching to same image as releases fixes the build"
Mark Felder [Wed, 10 Mar 2021 22:37:24 +0000 (16:37 -0600)]
Revert "See if switching to same image as releases fixes the build"

This reverts commit 502d166b7e44e36a94974df4770de6c6a239ad75.

3 years agoSee if switching to same image as releases fixes the build
Mark Felder [Wed, 10 Mar 2021 22:19:18 +0000 (16:19 -0600)]
See if switching to same image as releases fixes the build

3 years agoEnsure we fetch deps during spec-build stage
Mark Felder [Wed, 10 Mar 2021 19:03:14 +0000 (13:03 -0600)]
Ensure we fetch deps during spec-build stage

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Wed, 10 Mar 2021 04:48:50 +0000 (07:48 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

3 years agoMerge branch 'openapi/admin/user' into 'develop'
Haelwenn [Wed, 10 Mar 2021 03:24:40 +0000 (03:24 +0000)]
Merge branch 'openapi/admin/user' into 'develop'

Add OpenAPI spec for AdminAPI.UserController

See merge request pleroma/pleroma!3355

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Sun, 7 Mar 2021 08:34:39 +0000 (11:34 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

3 years ago[#3213] Performance optimization of filtering by hashtags ("any" condition).
Ivan Tashkinov [Sun, 7 Mar 2021 08:33:21 +0000 (11:33 +0300)]
[#3213] Performance optimization of filtering by hashtags ("any" condition).

3 years agoMake tests use it
Mark Felder [Fri, 5 Mar 2021 19:21:22 +0000 (13:21 -0600)]
Make tests use it

3 years agoAdd simple way to decode fully qualified mediaproxy URLs
Mark Felder [Fri, 5 Mar 2021 19:18:37 +0000 (13:18 -0600)]
Add simple way to decode fully qualified mediaproxy URLs

3 years agoUpdate OpenApiSpex dependency
Egor Kislitsyn [Fri, 5 Mar 2021 11:51:29 +0000 (15:51 +0400)]
Update OpenApiSpex dependency

3 years agoAdd UserOperation to Redoc
Egor Kislitsyn [Thu, 4 Mar 2021 17:13:53 +0000 (21:13 +0400)]
Add UserOperation to Redoc

3 years ago[#3213] ActivityPub hashtags filtering refactoring. Test fix.
Ivan Tashkinov [Wed, 3 Mar 2021 20:09:30 +0000 (23:09 +0300)]
[#3213] ActivityPub hashtags filtering refactoring. Test fix.

3 years agoMerge branch 'mergeback/2.3.0' into 'develop'
lain [Wed, 3 Mar 2021 15:07:50 +0000 (15:07 +0000)]
Merge branch 'mergeback/2.3.0' into 'develop'

Mergeback/2.3.0

See merge request pleroma/pleroma!3360

3 years agoChangelog: Re-add application support
lain [Wed, 3 Mar 2021 14:35:25 +0000 (15:35 +0100)]
Changelog: Re-add application support

3 years agoRevert "StatusController: Deactivate application support for now."
lain [Wed, 3 Mar 2021 14:33:06 +0000 (15:33 +0100)]
Revert "StatusController: Deactivate application support for now."

This reverts commit 024c11c18d289d4acd65d749f939ad3684f31905.

3 years agoChangelog, mix: merge in stable
lain [Wed, 3 Mar 2021 12:56:40 +0000 (13:56 +0100)]
Changelog, mix: merge in stable

3 years agoMerge branch 'fix-migration' into 'develop'
Haelwenn [Wed, 3 Mar 2021 00:57:39 +0000 (00:57 +0000)]
Merge branch 'fix-migration' into 'develop'

Fix migration in cases where database name has a hyphen

See merge request pleroma/pleroma!3359

3 years agoFix migration in cases where database name has a hyphen
Mark Felder [Wed, 3 Mar 2021 00:17:32 +0000 (18:17 -0600)]
Fix migration in cases where database name has a hyphen

3 years agoMerge branch 'fix/inconsistent-reference' into 'develop'
Haelwenn [Tue, 2 Mar 2021 20:48:40 +0000 (20:48 +0000)]
Merge branch 'fix/inconsistent-reference' into 'develop'

MastoAPI Status View: make consistently named object references

See merge request pleroma/pleroma!3358

3 years agoMerge branch 'fix/useless-header' into 'develop'
Haelwenn [Tue, 2 Mar 2021 20:47:21 +0000 (20:47 +0000)]
Merge branch 'fix/useless-header' into 'develop'

Test: remove useless header on the get request

See merge request pleroma/pleroma!3357

3 years agoMake the object reference in both render("show.json", _) functions consistently named
Mark Felder [Tue, 2 Mar 2021 20:14:38 +0000 (14:14 -0600)]
Make the object reference in both render("show.json", _) functions consistently named

3 years agoRemove useless header on the get request
Mark Felder [Tue, 2 Mar 2021 20:04:50 +0000 (14:04 -0600)]
Remove useless header on the get request

3 years agoMerge branch 'release/2.3.0' into 'stable'
lain [Tue, 2 Mar 2021 19:54:30 +0000 (19:54 +0000)]
Merge branch 'release/2.3.0' into 'stable'

Release/2.3.0

See merge request pleroma/pleroma!3354

3 years agoMerge branch 'application-to-generator' into 'develop'
feld [Tue, 2 Mar 2021 18:40:35 +0000 (18:40 +0000)]
Merge branch 'application-to-generator' into 'develop'

Status application field: test improvements

See merge request pleroma/pleroma!3356

3 years agoActually test viewing status after ingestion
Mark Felder [Tue, 2 Mar 2021 18:33:32 +0000 (12:33 -0600)]
Actually test viewing status after ingestion

3 years agoTest both ingestion of post in the status controller and the correct response during...
Mark Felder [Tue, 2 Mar 2021 18:29:16 +0000 (12:29 -0600)]
Test both ingestion of post in the status controller and the correct response during the view

3 years agoFix build_application/1 match
Mark Felder [Tue, 2 Mar 2021 17:37:37 +0000 (11:37 -0600)]
Fix build_application/1 match

3 years agoAdd OpenAPI spec for AdminAPI.UserController
Egor Kislitsyn [Tue, 2 Mar 2021 16:49:17 +0000 (20:49 +0400)]
Add OpenAPI spec for AdminAPI.UserController

3 years agoMix: Update linkify.
lain [Tue, 2 Mar 2021 16:03:14 +0000 (17:03 +0100)]
Mix: Update linkify.

3 years agoLinting.
lain [Tue, 2 Mar 2021 14:03:16 +0000 (15:03 +0100)]
Linting.

3 years agoChangelog: Remove application support line.
lain [Tue, 2 Mar 2021 13:42:11 +0000 (14:42 +0100)]
Changelog: Remove application support line.

3 years agoStatusController: Deactivate application support for now.
lain [Tue, 2 Mar 2021 13:40:47 +0000 (14:40 +0100)]
StatusController: Deactivate application support for now.

Some more things to discuss about, so we'll remove it from 2.3.0

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Tue, 2 Mar 2021 05:26:30 +0000 (08:26 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

3 years agoMix: Update version number
lain [Mon, 1 Mar 2021 20:13:43 +0000 (21:13 +0100)]
Mix: Update version number

3 years agoUpdate changelog
lain [Mon, 1 Mar 2021 20:12:26 +0000 (21:12 +0100)]
Update changelog

3 years agoDocument user agent leak fix
Mark Felder [Mon, 22 Feb 2021 22:19:08 +0000 (16:19 -0600)]
Document user agent leak fix

3 years agouser_agent_mock --> request_mock
Alex Gleason [Thu, 25 Feb 2021 03:37:30 +0000 (21:37 -0600)]
user_agent_mock --> request_mock

3 years agoNever forward the client's user-agent through the media proxy
Alex Gleason [Mon, 22 Feb 2021 20:46:59 +0000 (14:46 -0600)]
Never forward the client's user-agent through the media proxy

3 years agoMerge branch 'update-frontend-2021-03-01' into 'develop'
lain [Mon, 1 Mar 2021 19:21:52 +0000 (19:21 +0000)]
Merge branch 'update-frontend-2021-03-01' into 'develop'

Update frontend

See merge request pleroma/pleroma!3353

3 years agoUpdate frontend
lain [Mon, 1 Mar 2021 19:04:53 +0000 (20:04 +0100)]
Update frontend

3 years agoMerge branch 'application-to-generator' into 'develop'
Haelwenn [Mon, 1 Mar 2021 17:51:15 +0000 (17:51 +0000)]
Merge branch 'application-to-generator' into 'develop'

ActvitityStreams application field should be called "generator"

See merge request pleroma/pleroma!3352

3 years agoStore application details in the object under the generator key, not application key
Mark Felder [Mon, 1 Mar 2021 17:29:10 +0000 (11:29 -0600)]
Store application details in the object under the generator key, not application key

3 years agoMerge branch 'feld-develop-patch-26755' into 'develop'
feld [Sun, 28 Feb 2021 19:01:01 +0000 (19:01 +0000)]
Merge branch 'feld-develop-patch-26755' into 'develop'

Update CHANGELOG.md

See merge request pleroma/pleroma!3351

3 years agoUpdate CHANGELOG.md
feld [Sun, 28 Feb 2021 18:46:03 +0000 (18:46 +0000)]
Update CHANGELOG.md

3 years agoMerge branch 'fix/warning-in-test' into 'develop'
lain [Sun, 28 Feb 2021 16:53:05 +0000 (16:53 +0000)]
Merge branch 'fix/warning-in-test' into 'develop'

warning fix

See merge request pleroma/pleroma!3350

3 years agoMerge branch 'features/reports-enhancements' into 'develop'
lain [Sun, 28 Feb 2021 16:45:15 +0000 (16:45 +0000)]
Merge branch 'features/reports-enhancements' into 'develop'

Enhance reports in Pleroma API: index, show

See merge request pleroma/pleroma!3280

3 years agowarning fix
Alexander Strizhakov [Sun, 28 Feb 2021 16:41:25 +0000 (19:41 +0300)]
warning fix

3 years agoMerge branch 'admin-api-versioning' into 'develop'
lain [Sun, 28 Feb 2021 16:22:22 +0000 (16:22 +0000)]
Merge branch 'admin-api-versioning' into 'develop'

Pleroma APIs versioning

Closes #2509

See merge request pleroma/pleroma!3335

3 years agoMerge branch 'bugfix/peertube-mpegURL-object' into 'develop'
lain [Sun, 28 Feb 2021 16:18:23 +0000 (16:18 +0000)]
Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'

Video: Handle peertube videos only stashing attachments in x-mpegURL

Closes #2372 and #2535

See merge request pleroma/pleroma!3336

3 years agoMerge branch 'feat/client_app_details' into 'develop'
lain [Sun, 28 Feb 2021 16:17:34 +0000 (16:17 +0000)]
Merge branch 'feat/client_app_details' into 'develop'

Support application field

See merge request pleroma/pleroma!3311

3 years agoSimplify migration
Mark Felder [Sun, 28 Feb 2021 15:04:29 +0000 (09:04 -0600)]
Simplify migration

3 years agoRemove sensitive-property setting #nsfw, create HashtagPolicy
Haelwenn (lanodan) Monnier [Mon, 28 Dec 2020 22:21:53 +0000 (23:21 +0100)]
Remove sensitive-property setting #nsfw, create HashtagPolicy

3 years agoMerge branch 'frontendstatic-ignore-api-calls' into 'develop'
lain [Sat, 27 Feb 2021 19:40:38 +0000 (19:40 +0000)]
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'

Filter out API calls from FrontendStatic plug

Closes #2261

See merge request pleroma/pleroma!3346

3 years agoMerge branch 'fix/repo-terminate' into 'develop'
lain [Sat, 27 Feb 2021 19:37:08 +0000 (19:37 +0000)]
Merge branch 'fix/repo-terminate' into 'develop'

don't use continue in Stats init for test env

See merge request pleroma/pleroma!3349

3 years agodon't use continue in Stats init for test env
Alexander Strizhakov [Sat, 27 Feb 2021 06:39:15 +0000 (09:39 +0300)]
don't use continue in Stats init for test env

3 years agoStore the client application data in ActivityStreams format
Mark Felder [Sat, 27 Feb 2021 00:14:57 +0000 (18:14 -0600)]
Store the client application data in ActivityStreams format

3 years agoMerge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'
feld [Fri, 26 Feb 2021 16:49:11 +0000 (16:49 +0000)]
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'

expires_in in scheduled status params

Closes #2498

See merge request pleroma/pleroma!3315

3 years agoMerge branch 'ecto-rollback-in-test-env' into 'develop'
feld [Fri, 26 Feb 2021 16:47:53 +0000 (16:47 +0000)]
Merge branch 'ecto-rollback-in-test-env' into 'develop'

Possibility to run rollback in test env

See merge request pleroma/pleroma!3212

3 years agoMerge branch 'PestToast-develop-patch-66930' into 'develop'
rinpatch [Fri, 26 Feb 2021 09:21:15 +0000 (09:21 +0000)]
Merge branch 'PestToast-develop-patch-66930' into 'develop'

Removed a command that references "pleroma.env". This file does not seem to be...

See merge request pleroma/pleroma!3347

3 years agoRemoved a command that references "pleroma.env". This file does not seem to be genera...
PestToast [Fri, 26 Feb 2021 01:01:29 +0000 (01:01 +0000)]
Removed a command that references "pleroma.env". This file does not seem to be generated at any point during the install, and not having it does not stop the instance from working, as far as I can tell.

3 years agoNote our upgrade path for this functionality
Mark Felder [Thu, 25 Feb 2021 19:08:36 +0000 (13:08 -0600)]
Note our upgrade path for this functionality

3 years agoLeave a note for future explorers
Mark Felder [Thu, 25 Feb 2021 19:06:43 +0000 (13:06 -0600)]
Leave a note for future explorers

3 years agoNo need to filter out Mix.env() from the API routes.
Mark Felder [Thu, 25 Feb 2021 19:04:08 +0000 (13:04 -0600)]
No need to filter out Mix.env() from the API routes.

3 years agoImproved recursion through the api route list
Mark Felder [Thu, 25 Feb 2021 16:07:29 +0000 (10:07 -0600)]
Improved recursion through the api route list

3 years agoFilter out MIX_ENV from route list and add a test
Mark Felder [Thu, 25 Feb 2021 15:23:10 +0000 (09:23 -0600)]
Filter out MIX_ENV from route list and add a test

3 years agoEnum instead of Stream
Mark Felder [Thu, 25 Feb 2021 15:06:56 +0000 (09:06 -0600)]
Enum instead of Stream

3 years agoAttempt to filter out API calls from FrontendStatic plug
Mark Felder [Wed, 24 Feb 2021 21:23:45 +0000 (15:23 -0600)]
Attempt to filter out API calls from FrontendStatic plug

3 years agoMerge branch 'gitignore' into 'develop'
Haelwenn [Wed, 24 Feb 2021 18:32:55 +0000 (18:32 +0000)]
Merge branch 'gitignore' into 'develop'

gitignore: Vi and emacs temp files

See merge request pleroma/pleroma!3345

3 years agoVi and emacs temp files
Mark Felder [Wed, 24 Feb 2021 18:11:50 +0000 (12:11 -0600)]
Vi and emacs temp files

3 years agoMerge branch 'docfix/chat-token' into 'develop'
Haelwenn [Wed, 24 Feb 2021 17:26:26 +0000 (17:26 +0000)]
Merge branch 'docfix/chat-token' into 'develop'

Update terminology in differences_in_mastoapi_responses.md

See merge request pleroma/pleroma!3344

3 years agoUpdate terminology in differences_in_mastoapi_responses.md
zonk [Wed, 24 Feb 2021 14:23:56 +0000 (14:23 +0000)]
Update terminology in differences_in_mastoapi_responses.md

3 years ago[#3213] `mix pleroma.database rollback` tweaks.
Ivan Tashkinov [Tue, 23 Feb 2021 15:11:25 +0000 (18:11 +0300)]
[#3213] `mix pleroma.database rollback` tweaks.

3 years agoMerge branch 'fix/whalebird-url' into 'develop'
feld [Tue, 23 Feb 2021 14:17:06 +0000 (14:17 +0000)]
Merge branch 'fix/whalebird-url' into 'develop'

Fix URL of Whalebird in docs

See merge request pleroma/pleroma!3339

3 years agoMerge branch 'chore/no-activitypub-sleeps' into 'develop'
lain [Tue, 23 Feb 2021 13:53:59 +0000 (13:53 +0000)]
Merge branch 'chore/no-activitypub-sleeps' into 'develop'

Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote

See merge request pleroma/pleroma!3330

3 years agoFix URL of Whalebird in docs
AkiraFukushima [Tue, 23 Feb 2021 12:31:06 +0000 (21:31 +0900)]
Fix URL of Whalebird in docs

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Tue, 23 Feb 2021 10:58:35 +0000 (13:58 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex