diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-30 18:15:44 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-30 18:15:44 +0000 |
| commit | ca24ad2a2babed0700a38effb74910008d58f6ea (patch) | |
| tree | 13430c7b870e3dcc7cb32c299cbde6ca8d6ef362 /.gitignore | |
| parent | e99bab8f279b419a6b54efa2f5397a78970c10ee (diff) | |
| parent | 8e0e20631c378a5008f0f0b4aba9deb994ea6c6c (diff) | |
| download | pleroma-ca24ad2a2babed0700a38effb74910008d58f6ea.tar.gz pleroma-ca24ad2a2babed0700a38effb74910008d58f6ea.zip | |
Merge branch 'feature/reverse-proxy' into 'develop'
reverse proxy / uploads
See merge request pleroma/pleroma!470
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 9aad700ee..b71dfa9fa 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ /uploads /test/uploads /.elixir_ls +/test/fixtures/test_tmp.txt +/test/fixtures/image_tmp.jpg +/doc # Prevent committing custom emojis /priv/static/emoji/custom/* @@ -28,4 +31,4 @@ erl_crash.dump .env # Editor config -/.vscode
\ No newline at end of file +/.vscode |