]> granicus.if.org Git - ejabberd/commitdiff
Merge remote-tracking branch 'processone/pr/1261'
authorHolger Weiss <holger@zedat.fu-berlin.de>
Mon, 22 Aug 2016 19:22:08 +0000 (21:22 +0200)
committerHolger Weiss <holger@zedat.fu-berlin.de>
Mon, 22 Aug 2016 19:22:08 +0000 (21:22 +0200)
* processone/pr/1261:
  Fixed #1260 Stream Management feature for the websocket connections


Trivial merge