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

fix issues with the uploads directory See merge request pleroma/pleroma!1101
2019-04-28 23:05:50 +00:00 · 2019-04-28 23:05:50 +00:00 · 8e266e02da
parent 292c69481b 31852f906e
commit 8e266e02da
2 changed files with 3 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,7 +3,6 @@
 /db
 /deps
 /*.ez
-/uploads
 /test/uploads
 /.elixir_ls
 /test/fixtures/test_tmp.txt
--- a/uploads/.gitignore
+++ b/uploads/.gitignore
@ -0,0 +1,3 @@
+# Git will ignore everything in this directory except this file.
+*
+!.gitignore