]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
projects / user / henk / code / inspircd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33d0a3b 0412378)
Merge branch 'master+chanwritenotice'
authorAttila Molnar <attilamolnar@hush.com>
Sat, 5 Mar 2016 15:58:50 +0000 (16:58 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Sat, 5 Mar 2016 15:58:50 +0000 (16:58 +0100)

Trivial merge