mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-12 01:13:10 -06:00
Merge remote-tracking branch 'origin/master' into markjh/federation_sender
This commit is contained in:
commit
da542124dc
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -1,11 +1,18 @@
|
||||||
.*.swp
|
.*.swp
|
||||||
|
|
||||||
|
# Hidden files
|
||||||
|
.*
|
||||||
|
|
||||||
|
# Downloads
|
||||||
|
kafka.tgz
|
||||||
|
|
||||||
# Compiled Object files, Static and Dynamic libs (Shared Objects)
|
# Compiled Object files, Static and Dynamic libs (Shared Objects)
|
||||||
*.o
|
*.o
|
||||||
*.a
|
*.a
|
||||||
*.so
|
*.so
|
||||||
|
|
||||||
# Folders
|
# Folders
|
||||||
|
kafka
|
||||||
bin
|
bin
|
||||||
pkg
|
pkg
|
||||||
_obj
|
_obj
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue