summaryrefslogtreecommitdiff
path: root/uploads
diff options
context:
space:
mode:
authormarcin mikołajczak <git@mkljczk.pl>2024-05-18 11:16:33 +0200
committermarcin mikołajczak <git@mkljczk.pl>2024-05-18 11:16:33 +0200
commit7620b520c13a1c204810cf0cfe6a7b70b9a1c59d (patch)
treec4a24d0f0a513c697db8d0197e179a70108063d4 /uploads
parent03d4e7eeccc7fc69c731ada8a7bd049ad52a9d6f (diff)
parent99eab1fa2a39b7a7fba6cdbb92c01e9c7c81aa88 (diff)
downloadpleroma-7620b520c13a1c204810cf0cfe6a7b70b9a1c59d.tar.gz
pleroma-7620b520c13a1c204810cf0cfe6a7b70b9a1c59d.zip
Merge remote-tracking branch 'origin/develop' into post-languages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'uploads')
-rw-r--r--uploads/.gitignore3
1 files changed, 0 insertions, 3 deletions
diff --git a/uploads/.gitignore b/uploads/.gitignore
deleted file mode 100644
index 523e584a7..000000000
--- a/uploads/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Git will ignore everything in this directory except this file.
-*
-!.gitignore