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 2fce38981d3f28c03bca071b7692c986a9a19b36..66d1376c53f173e3c5af516b9615cdcd839218f7 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-6,6
+6,7
@@
secret
/*.ez
/test/uploads
/.elixir_ls
+/test/fixtures/DSCN0010_tmp.jpg
/test/fixtures/test_tmp.txt
/test/fixtures/image_tmp.jpg
/test/tmp/
@@
-48,3
+49,5
@@
docs/generated_config.md
.idea
pleroma.iml
+# asdf
+.tool-versions