]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 391c412 57fcbb8)
Merge "res_xmpp: Correct implementation of JABBER_STATUS & JabberStatus" into 14
authorJoshua Colp <jcolp@digium.com>
Fri, 24 Mar 2017 22:46:29 +0000 (17:46 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 24 Mar 2017 22:46:29 +0000 (17:46 -0500)
1  2 
res/res_xmpp.c patch | diff1 | diff2 | blob | history

diff --cc res/res_xmpp.c
Simple merge
Mirror of https://github.com/asterisk/asterisk.git