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 6ae21e9144f410f289fc0734b714bfcbd7226aac..08ef8999b821ae168e1b71a711ebfe709ceac256 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,8
+1,10
@@
# App artifacts
# App artifacts
+secret
/_build
/db
/deps
/*.ez
/_build
/db
/deps
/*.ez
+/test/instance
/test/uploads
/.elixir_ls
/test/fixtures/DSCN0010_tmp.jpg
/test/uploads
/.elixir_ls
/test/fixtures/DSCN0010_tmp.jpg
@@
-31,7
+33,7
@@
erl_crash.dump
# Database setup file, some may forget to delete it
# Database setup file, some may forget to delete it
-/config/setup_db.psql
+/config/setup_db
*
.psql
.DS_Store
.env
.DS_Store
.env
@@
-52,3
+54,7
@@
pleroma.iml
# asdf
.tool-versions
# asdf
.tool-versions
+
+# Editor temp files
+/*~
+/*#
\ No newline at end of file