]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b475a8 5ac65dd)
Merge "res/ari: Register Stasis application on WebSocket attempt" into 13
authorMatt Jordan <mjordan@digium.com>
Fri, 22 May 2015 16:19:50 +0000 (11:19 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 22 May 2015 16:19:51 +0000 (11:19 -0500)

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