projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
1dfe9f0
)
Merge branch 'configurable-notifications-250' into next
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Fri, 11 Nov 2011 12:24:57 +0000
(13:24 +0100)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Fri, 11 Nov 2011 12:26:04 +0000
(13:26 +0100)
This resolves #250.
Conflicts:
src/main/java/net/pterodactylus/sone/core/Core.java
No differences found
projects / Sone.git / commitdiff