Moises Silva 2a00d3ea13 Merge remote branch 'fsorig/master' ...

Conflicts:
	conf/dialplan/default.xml

2010-11-30 12:19:42 -05:00

..

autoload_configs

Merge remote branch 'fsorig/master'

2010-11-30 12:19:42 -05:00

dialplan

fix single domain assumption in default config to be more portable *cough* bkw *cough*

2010-11-24 21:36:21 -06:00

directory

fix single domain assumption in default config to be more portable *cough* bkw *cough*

2010-11-24 21:36:21 -06:00

ivr_menus

Change last references of 9999 to 9664 for MOH

2010-06-30 12:08:50 -07:00

jingle_profiles

adding auto-nat options to dingaling

2009-06-25 21:38:44 +00:00

lang

Part of FS-2742

2010-10-01 15:20:40 -05:00

mrcp_profiles

Added synthparams and recogparams to config so that default MRCP params can be defined for SPEAK and RECOGNIZE requests.

2010-02-22 14:26:16 +00:00

sip_profiles

Merge remote branch 'fsorig/master'

2010-11-30 12:19:42 -05:00

skinny_profiles

Fixed some windows compile warnings from merge

2010-11-19 14:33:57 -05:00

yaml

Change last references of 9999 to 9664 for MOH

2010-06-30 12:08:50 -07:00

extensions.conf

…

freeswitch.xml

FSCONFIG-17

2010-01-19 17:34:41 +00:00

fur_elise.ttml

…

mime.types

…

notify-voicemail.tpl

Create RFC2822_DATE for use in emails. Some clients fail to sort emails properly without a Date: line.

2010-08-17 09:44:36 -05:00

tetris.ttml

…

vars.xml

Fixed some windows compile warnings from merge

2010-11-19 14:33:57 -05:00

voicemail.tpl

Create RFC2822_DATE for use in emails. Some clients fail to sort emails properly without a Date: line.

2010-08-17 09:44:36 -05:00

web-vm.tpl

…