aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2022-01-03 13:40:19 -0600
committerAlex Gleason <alex@alexgleason.me>2022-01-03 13:40:19 -0600
commit4081be0001332bac402faec7565807df088b0117 (patch)
treea5305404e9bb31b3613dbc9631d36f8827be81c2 /.gitignore
parentd00f74e036735c1c238f661076f2925b39daa6ac (diff)
parenta3094b64df344622f1bcb03091ef2ff4dce6da82 (diff)
downloadpleroma-matrix.tar.gz
Merge remote-tracking branch 'origin/develop' into matrixmatrix
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore10
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 599b52b9e..da73b6f36 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,12 @@ erl_crash.dump
# variables.
/config/*.secret.exs
/config/generated_config.exs
+/config/runtime.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 +54,7 @@ pleroma.iml
# asdf
.tool-versions
+
+# Editor temp files
+/*~
+/*#