diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-28 23:05:50 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-28 23:05:50 +0000 |
| commit | 8e266e02da15275c4e17533a50ee4c0eaf65227f (patch) | |
| tree | 169755cb40769a86dca061290244272e78cb986b | |
| parent | 292c69481b6baff7511e28e25f51dbd723308241 (diff) | |
| parent | 31852f906e6a16c3e9ab2343f8f9634893a80801 (diff) | |
| download | pleroma-8e266e02da15275c4e17533a50ee4c0eaf65227f.tar.gz | |
Merge branch 'fix/uploads-folder-issues' into 'develop'
fix issues with the uploads directory
See merge request pleroma/pleroma!1101
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | uploads/.gitignore | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 774893b35..a1e79e4be 100644 --- 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 new file mode 100644 index 000000000..523e584a7 --- /dev/null +++ b/uploads/.gitignore @@ -0,0 +1,3 @@ +# Git will ignore everything in this directory except this file. +* +!.gitignore |