summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2021-03-02 19:54:30 +0000
committerlain <lain@soykaf.club>2021-03-02 19:54:30 +0000
commitb221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (patch)
tree0015c7c3ea57f7340fbf80fd230a5f5e1c548148 /.gitignore
parentc2186a62d54043ea9638d33f80c7576aba9783e8 (diff)
parent0a589c887bd4215e7d443a34c194fd0a3bde8f72 (diff)
Merge branch 'release/2.3.0' into 'stable'
Release/2.3.0 See merge request pleroma/pleroma!3354
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore9
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 599b52b9e..f30f4cf5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
/db
/deps
/*.ez
+/test/instance
/test/uploads
/.elixir_ls
/test/fixtures/DSCN0010_tmp.jpg
@@ -27,9 +28,11 @@ erl_crash.dump
# variables.
/config/*.secret.exs
/config/generated_config.exs
+/config/*.env
+
# Database setup file, some may forget to delete it
-/config/setup_db.psql
+/config/setup_db*.psql
.DS_Store
.env
@@ -50,3 +53,7 @@ pleroma.iml
# asdf
.tool-versions
+
+# Editor temp files
+/*~
+/*# \ No newline at end of file