]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c111bb dd17a57)
Merge pull request #1034 in FS/freeswitch from ~CRIENZO/freeswitch:fs-9694 to master
authorMike Jerris <mike@jerris.com>
Fri, 4 Nov 2016 18:09:14 +0000 (13:09 -0500)
committerMike Jerris <mike@jerris.com>
Fri, 4 Nov 2016 18:09:14 +0000 (13:09 -0500)
* commit 'dd17a57c8a128c97f12fe1882e5123de92d1cf3e':
  FS-9694 [mod_dptools] Add origination_uuid support to pickup endpoint


Trivial merge
Mirror of https://github.com/signalwire/freeswitch.git