summaryrefslogtreecommitdiff
path: root/uploads
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-05-01 18:40:41 +0200
committerlain <lain@soykaf.club>2019-05-01 18:40:41 +0200
commit45f790becc2cc63ac000c6432fe8c84e0b589822 (patch)
tree724d0e8ce5f10807cc25efc2434454bf38c5a52c /uploads
parent4908e0eeee2ecb58b204198c20720d52548b6f4a (diff)
parentd107919b3d8b2275ddb7b17846cab182682098a7 (diff)
downloadpleroma-45f790becc2cc63ac000c6432fe8c84e0b589822.tar.gz
pleroma-45f790becc2cc63ac000c6432fe8c84e0b589822.zip
Merge remote-tracking branch 'origin/develop' into conversations_three
Diffstat (limited to 'uploads')
-rw-r--r--uploads/.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/uploads/.gitignore b/uploads/.gitignore
new file mode 100644
index 000000000..523e584a7
--- /dev/null
+++ b/uploads/.gitignore
@@ -0,0 +1,3 @@
+# Git will ignore everything in this directory except this file.
+*
+!.gitignore