summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-15 16:39:01 -0500
committerMark Felder <feld@FreeBSD.org>2020-10-15 16:39:01 -0500
commitfb056ce05b43841ce57135ffb0b25845c41639ef (patch)
treeedd3e47128b454ab721027b5c6f30d0bcc5bd27c /.gitignore
parent724e4b7f00041667b9fa61fd1b7dd51c8eeaa102 (diff)
parent5703fb6d2a5f9fcffe050eadbc43758bcd2efa14 (diff)
downloadpleroma-fb056ce05b43841ce57135ffb0b25845c41639ef.tar.gz
pleroma-fb056ce05b43841ce57135ffb0b25845c41639ef.zip
Merge branch 'develop' into refactor/discoverable_user_field
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 599b52b9e..6ae21e914 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,8 @@ 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