Commit 8e266e02 authored by kaniini's avatar kaniini

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

fix issues with the uploads directory

See merge request pleroma/pleroma!1101
parents 292c6948 31852f90
......@@ -3,7 +3,6 @@
/db
/deps
/*.ez
/uploads
/test/uploads
/.elixir_ls
/test/fixtures/test_tmp.txt
......
# Git will ignore everything in this directory except this file.
*
!.gitignore
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment