]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f3d8a3b)
FS-10762: [freeswitch-core] Websocket logic error #resolve
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 14 Nov 2017 18:28:25 +0000 (12:28 -0600)
committerMuteesa Fred <muteesafred@hotmail.com>
Tue, 24 Jul 2018 07:21:35 +0000 (07:21 +0000)
libs/sofia-sip/.update patch | blob | blame | history

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 057976b4c19bd7ed3e5e874ee2b9e3ceba208a92..4b6b39e5d04b4431c7f35185192e98ace3bd0830 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1,5 @@
+<<<<<<< HEAD
 Mon Jan 15 01:36:14 EST 2018
+=======
+Tue Nov 14 12:28:03 CST 2017
+>>>>>>> 96a8ad2378... FS-10762: [freeswitch-core] Websocket logic error #resolve
Mirror of https://github.com/signalwire/freeswitch.git