projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
:Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 62ca61bce780d92f3ffdbb71093d76a40488b025..cb1ba45a8e6d8108ee56a82e0176cc8145c09e55 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,4
+1,5
@@
# App artifacts
# App artifacts
+secret
/_build
/db
/deps
/_build
/db
/deps
@@
-28,11
+29,12
@@
erl_crash.dump
# variables.
/config/*.secret.exs
/config/generated_config.exs
# variables.
/config/*.secret.exs
/config/generated_config.exs
+/config/runtime.exs
/config/*.env
# Database setup file, some may forget to delete it
/config/*.env
# Database setup file, some may forget to delete it
-/config/setup_db.psql
+/config/setup_db
*
.psql
.DS_Store
.env
.DS_Store
.env
@@
-53,3
+55,7
@@
pleroma.iml
# asdf
.tool-versions
# asdf
.tool-versions
+
+# Editor temp files
+/*~
+/*#