summaryrefslogtreecommitdiff
path: root/uploads
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2024-08-01 08:53:29 +0000
committerlain <lain@soykaf.club>2024-08-01 08:53:29 +0000
commit36d469cf022ea66947a73ee4c762d7f459aceee4 (patch)
tree5f8824d56f10d1c94353afeb77833cd250e67369 /uploads
parent7566b4a348c66fcea45bcb017979ece9c7b45b3a (diff)
parenta5d32aab50abf725196fa782775a38907b4b2afa (diff)
downloadpleroma-36d469cf022ea66947a73ee4c762d7f459aceee4.tar.gz
pleroma-36d469cf022ea66947a73ee4c762d7f459aceee4.zip
Merge branch 'release/2.7.0' into 'stable'
v2.7.0 See merge request pleroma/pleroma!4179
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