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 git.pleroma.social:pleroma/pleroma into alexgleason/pleroma...
[akkoma]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 9591f997639479396f5c5e458e561cdc15b841a2..6ae21e9144f410f289fc0734b714bfcbd7226aac 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-5,6
+5,7
@@
/*.ez
/test/uploads
/.elixir_ls
/*.ez
/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/
@@
-26,6
+27,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
@@
-38,7
+41,14
@@
erl_crash.dump
# Prevent committing docs files
/priv/static/doc/*
# Prevent committing docs files
/priv/static/doc/*
+docs/generated_config.md
# Code test coverage
/cover
/Elixir.*.coverdata
# Code test coverage
/cover
/Elixir.*.coverdata
+
+.idea
+pleroma.iml
+
+# asdf
+.tool-versions