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

fix issues with the uploads directory

See merge request pleroma/pleroma!1101

.gitignore

@@ -3,7 +3,6 @@
 /db
 /deps
 /*.ez
-/uploads
 /test/uploads
 /.elixir_ls
 /test/fixtures/test_tmp.txt

uploads/.gitignore

+# Git will ignore everything in this directory except this file.
+*
+!.gitignore