]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b84290 cb56ef8)
Merge "res_http_websocket: Make core supported." into 13
authorJoshua Colp <jcolp@digium.com>
Tue, 5 Apr 2016 16:40:54 +0000 (11:40 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 5 Apr 2016 16:40:54 +0000 (11:40 -0500)

Trivial merge
Mirror of https://github.com/asterisk/asterisk.git