Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-fix-3241

2024-03-17 16:42:17 +04:00 · 2024-03-17 16:42:17 +04:00 · 0450da88b6
commit 0450da88b6
parent 1422082bf2 95bcd5d28f
22 changed files with 386 additions and 32 deletions
--- a/changelog.d/backups-follows.add
+++ b/changelog.d/backups-follows.add
@ -0,0 +1 @@
+Include following/followers in backups
--- a/changelog.d/force-mention-mrf.add
+++ b/changelog.d/force-mention-mrf.add
@ -0,0 +1 @@
+Add ForceMention MRF
--- a/changelog.d/framegrabs.fix
+++ b/changelog.d/framegrabs.fix
@ -0,0 +1 @@
+Video framegrabs were not working correctly after the change to use Exile to execute ffmpeg
--- a/changelog.d/instance-contact-account.add
+++ b/changelog.d/instance-contact-account.add
@ -0,0 +1 @@
+Add contact account to InstanceView
--- a/changelog.d/instance-v2.skip
+++ b/changelog.d/instance-v2.skip
--- a/changelog.d/link-verification.add
+++ b/changelog.d/link-verification.add
@ -0,0 +1 @@
+Verify profile link ownership with rel="me"
				`@ -0,0 +1 @@`
				`Video framegrabs were not working correctly after the change to use Exile to execute ffmpeg`