David Yat Sin 4585dbffbb Fixed conflict from previous merge

2012-07-25 11:27:01 -04:00

..

autoload_configs

Fixed conflict from previous merge

2012-07-25 11:27:01 -04:00

chatplan

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

dialplan

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

directory

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

ivr_menus

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

jingle_profiles

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

lang

mod_voicemail: Improved feedback to user when chaning vm passwords.

2012-05-09 15:20:40 -07:00

mrcp_profiles

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

sip_profiles

add inbound-zrtp-passthru to sample configs

2012-05-27 05:58:12 +00:00

skinny_profiles

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

yaml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

config.FS0

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

extensions.conf

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

freeswitch.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

fur_elise.ttml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

mime.types

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

notify-voicemail.tpl

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

README_IMPORTANT.txt

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

tetris.ttml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

vars.xml

don't use Siren or iLBC by default in example configs

2012-05-29 18:41:17 +00:00

voicemail.tpl

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

web-vm.tpl

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00