]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b60df39 05ef189)
Merge pull request #25 in FS/freeswitch from ~STEVEAYRE/freeswitch:master to master
authorMike Jerris <mike@jerris.com>
Wed, 13 Aug 2014 18:37:17 +0000 (13:37 -0500)
committerMike Jerris <mike@jerris.com>
Wed, 13 Aug 2014 18:37:17 +0000 (13:37 -0500)
* commit '05ef18948d3870c4afcd82ce32e164e4a152a8e1':
  add uptime api to mod_commands


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