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..d1d7977f11d2ed0dc22f0748aed8f069a543915f 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,8
+1,10
@@
# App artifacts
+secret
/_build
/db
/deps
/*.ez
+/test/instance
/test/uploads
/.elixir_ls
/test/fixtures/DSCN0010_tmp.jpg