summaryrefslogtreecommitdiff
path: root/uploads
diff options
context:
space:
mode:
authorLain Soykaf <lain@lain.com>2024-05-27 16:23:40 +0400
committerLain Soykaf <lain@lain.com>2024-05-27 16:23:40 +0400
commit825b4122a5cda720cb567196ad34e456a68f5dc6 (patch)
tree9b41826b70cf7825db5535cd0383b1aebc48806d /uploads
parent21d9091f5e422493ff69fe59db9c965e0d511369 (diff)
parent6757382abec9ca47a9025b8bed61047414cee20f (diff)
downloadpleroma-825b4122a5cda720cb567196ad34e456a68f5dc6.tar.gz
pleroma-825b4122a5cda720cb567196ad34e456a68f5dc6.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-ipfs_uploader
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