diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-05-07 16:51:11 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-05-07 16:51:11 +0700 |
| commit | 1557b99beb3b406572ef2d3baaabed1c9baeca1c (patch) | |
| tree | 34041b8526ecfa38fcb0b471718de0b3b71aa8c4 /.gitignore | |
| parent | c157e27a000a12dc8f660c056744a6611beb01b1 (diff) | |
| parent | 6518644db1d31f2b30b95fa0899b3751bc330d56 (diff) | |
| download | pleroma-1557b99beb3b406572ef2d3baaabed1c9baeca1c.tar.gz pleroma-1557b99beb3b406572ef2d3baaabed1c9baeca1c.zip | |
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 774893b35..082c7491b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ /db /deps /*.ez -/uploads /test/uploads /.elixir_ls /test/fixtures/test_tmp.txt @@ -11,6 +10,7 @@ /test/tmp/ /doc /instance +/priv/ssh_keys # Prevent committing custom emojis /priv/static/emoji/custom/* |