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 08ef8999b821ae168e1b71a711ebfe709ceac256..cb1ba45a8e6d8108ee56a82e0176cc8145c09e55 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-29,6
+29,7
@@
erl_crash.dump
# variables.
/config/*.secret.exs
/config/generated_config.exs
+/config/runtime.exs
/config/*.env
@@
-57,4
+58,4
@@
pleroma.iml
# Editor temp files
/*~
-/*#
\ No newline at end of file
+/*#