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

fix issues with the uploads directory

See merge request pleroma/pleroma!1101
This commit is contained in:
kaniini 2019-04-28 23:05:50 +00:00
commit 8e266e02da
2 changed files with 3 additions and 1 deletions

1
.gitignore vendored
View file

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

3
uploads/.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
# Git will ignore everything in this directory except this file.
*
!.gitignore