Merge "ARI: Channels added to Stasis application during WebSocket creation ..."
authorMark Michelson <mmichelson@digium.com>
Fri, 31 Jul 2015 16:58:30 +0000 (11:58 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 31 Jul 2015 16:58:30 +0000 (11:58 -0500)
1  2 
res/res_http_websocket.c

Simple merge