diff options
| author | rinpatch <rinpatch@sdf.org> | 2018-12-18 21:39:36 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2018-12-18 21:39:36 +0300 |
| commit | ef318fb8a96ddf276393f4ec81d3242dd7c6a4d4 (patch) | |
| tree | a030123a4bbe071613e87c41bee00333727208dc /.gitignore | |
| parent | 059dd6f681caf14ee9d288ec14b82132be29ae2c (diff) | |
| parent | 443d59baa05165c3b5b7ab14f3eabd6f2eba09f2 (diff) | |
| download | pleroma-ef318fb8a96ddf276393f4ec81d3242dd7c6a4d4.tar.gz pleroma-ef318fb8a96ddf276393f4ec81d3242dd7c6a4d4.zip | |
Merge branch 'develop' into fix/formatter-ignore-html-chars
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b71dfa9fa..72fe2ce43 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,9 @@ /.elixir_ls /test/fixtures/test_tmp.txt /test/fixtures/image_tmp.jpg +/test/tmp/ /doc +/instance # Prevent committing custom emojis /priv/static/emoji/custom/* @@ -31,4 +33,4 @@ erl_crash.dump .env # Editor config -/.vscode +/.vscode/ |