]> 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: 4a12fc9 a86e320)
Merge branch 'master+websocket'
authorAttila Molnar <attilamolnar@hush.com>
Wed, 10 Aug 2016 13:57:04 +0000 (15:57 +0200)
committerAttila Molnar <attilamolnar@hush.com>
Wed, 10 Aug 2016 13:57:04 +0000 (15:57 +0200)

Trivial merge