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

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

Merge remote branch 'fsorig/master'

Conflicts:
conf/dialplan/default.xml

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

conf/sip_profiles/internal.xml	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftdm_io.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c	diff1 \|	diff2 \|	blob \| history