projects
/
xudocci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa0781d
845acd1
)
🔀 Merge remote-tracking branch 'origin/master'
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Sat, 6 Nov 2021 20:52:16 +0000
(21:52 +0100)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Sat, 6 Nov 2021 20:52:16 +0000
(21:52 +0100)
1
2
src/main/java/net/pterodactylus/xdcc/core/Core.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/main/java/net/pterodactylus/xdcc/core/Core.java
Simple merge