From c218f32f6b74ebd1df7db449ee89daefa3efb257 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Sun, 7 Jan 2024 14:50:17 +0300
Subject: Add a changelog entry

---
 changelog.d/admin-emoji-packs.add | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/admin-emoji-packs.add

(limited to 'changelog.d')

diff --git a/changelog.d/admin-emoji-packs.add b/changelog.d/admin-emoji-packs.add
new file mode 100644
index 00000000..243163e8
--- /dev/null
+++ b/changelog.d/admin-emoji-packs.add
@@ -0,0 +1 @@
+Added emoji pack management to the admin panel
-- 
cgit v1.2.3-70-g09d2


From 303bfa6e39383ddddd988e08cde2327e1908ac1f Mon Sep 17 00:00:00 2001
From: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Mon, 29 Jan 2024 22:54:10 +0000
Subject: Revert "Merge branch 'video-poster' into 'develop'"

This reverts merge request !1879
---
 changelog.d/video-poster.fix                         | 1 -
 src/components/video_attachment/video_attachment.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 changelog.d/video-poster.fix

(limited to 'changelog.d')

diff --git a/changelog.d/video-poster.fix b/changelog.d/video-poster.fix
deleted file mode 100644
index 43e95f6e..00000000
--- a/changelog.d/video-poster.fix
+++ /dev/null
@@ -1 +0,0 @@
-Video posters on Safari
diff --git a/src/components/video_attachment/video_attachment.vue b/src/components/video_attachment/video_attachment.vue
index 23eb4c55..8a3ea1e3 100644
--- a/src/components/video_attachment/video_attachment.vue
+++ b/src/components/video_attachment/video_attachment.vue
@@ -2,7 +2,7 @@
   <video
     class="video"
     preload="metadata"
-    :src="attachment.url + '#t=0.5'"
+    :src="attachment.url"
     :loop="loopVideo"
     :controls="controls"
     :alt="attachment.description"
-- 
cgit v1.2.3-70-g09d2


From 45a4b204c8978c4c3bf30101e24900de5ac20559 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 29 Feb 2024 22:04:10 +0200
Subject: changelog

---
 changelog.d/video-poster.fix         | 1 +
 changelog.d/video-poster.update.skip | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/video-poster.fix
 create mode 100644 changelog.d/video-poster.update.skip

(limited to 'changelog.d')

diff --git a/changelog.d/video-poster.fix b/changelog.d/video-poster.fix
new file mode 100644
index 00000000..43e95f6e
--- /dev/null
+++ b/changelog.d/video-poster.fix
@@ -0,0 +1 @@
+Video posters on Safari
diff --git a/changelog.d/video-poster.update.skip b/changelog.d/video-poster.update.skip
new file mode 100644
index 00000000..9dafe9be
--- /dev/null
+++ b/changelog.d/video-poster.update.skip
@@ -0,0 +1 @@
+nothing
-- 
cgit v1.2.3-70-g09d2