pleroma

commit: 8e266e02da15275c4e17533a50ee4c0eaf65227f
parent 292c69481b6baff7511e28e25f51dbd723308241
Author: kaniini <nenolod@gmail.com>
Date:   Sun, 28 Apr 2019 23:05:50 +0000

Merge branch 'fix/uploads-folder-issues' into 'develop'

fix issues with the uploads directory

See merge request pleroma/pleroma!1101
Diffstat:
M
.gitignore
1
-
A
uploads/.gitignore
3
+++

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@
 /db
 /deps
 /*.ez
-/uploads
 /test/uploads
 /.elixir_ls
 /test/fixtures/test_tmp.txt
diff --git a/uploads/.gitignore b/uploads/.gitignore
@@ -0,0 +1,3 @@
+# Git will ignore everything in this directory except this file.
+*
+!.gitignore