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 c108ad2625f20e34dac00c3364efd8ad35049b17..d1d7977f11d2ed0dc22f0748aed8f069a543915f 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-4,8
+4,10
@@
secret
/db
/deps
/*.ez
/db
/deps
/*.ez
+/test/instance
/test/uploads
/.elixir_ls
/test/uploads
/.elixir_ls
+/test/fixtures/DSCN0010_tmp.jpg
/test/fixtures/test_tmp.txt
/test/fixtures/image_tmp.jpg
/test/tmp/
/test/fixtures/test_tmp.txt
/test/fixtures/image_tmp.jpg
/test/tmp/
@@
-27,6
+29,8
@@
erl_crash.dump
# variables.
/config/*.secret.exs
/config/generated_config.exs
# variables.
/config/*.secret.exs
/config/generated_config.exs
+/config/*.env
+
# Database setup file, some may forget to delete it
/config/setup_db.psql
# Database setup file, some may forget to delete it
/config/setup_db.psql