Learn more about cloning repositories
You have read-only access
Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder Conflicts: libs/freetdm/mod_freetdm/mod_freetdm.c libs/freetdm/src/ftdm_state.c
