git.ipfire.org Git - thirdparty/freeswitch.git/commit

]> git.ipfire.org Git - thirdparty/freeswitch.git/commit

Merge branch 'master' into smgmaster

Conflicts:
libs/esl/fs_cli.c

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

libs/esl/fs_cli.c	diff1 \|	diff2 \|	blob \| history
src/mod/applications/mod_commands/mod_commands.c	diff1 \|	diff2 \|	blob \| history
src/mod/endpoints/mod_sofia/mod_sofia.c	diff1 \|	diff2 \|	blob \| history
src/switch_console.c	diff1 \|	diff2 \|	blob \| history
src/switch_core.c	diff1 \|	diff2 \|	blob \| history