summaryrefslogtreecommitdiff
path: root/changelog.d/mergeback-2.6.2.skip
diff options
context:
space:
mode:
authormarcin mikołajczak <git@mkljczk.pl>2024-02-22 11:59:15 +0100
committermarcin mikołajczak <git@mkljczk.pl>2024-02-22 21:05:20 +0100
commitc592a0e58d7207532f2f7be2fff788c9dc695fb5 (patch)
tree74477cba37813c549a05d692ae04c135793496a1 /changelog.d/mergeback-2.6.2.skip
parentdef088ce520ffac3e200cbf63b049f1d918d2b79 (diff)
parentf0468697cd74f4ec062f9c6feda53cfbe9e4500c (diff)
downloadpleroma-c592a0e58d7207532f2f7be2fff788c9dc695fb5.tar.gz
pleroma-c592a0e58d7207532f2f7be2fff788c9dc695fb5.zip
Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'changelog.d/mergeback-2.6.2.skip')
-rw-r--r--changelog.d/mergeback-2.6.2.skip0
1 files changed, 0 insertions, 0 deletions
diff --git a/changelog.d/mergeback-2.6.2.skip b/changelog.d/mergeback-2.6.2.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/mergeback-2.6.2.skip