Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton

sebelk · Apr 2, 2013 · 1d18ddf · 1d18ddf
2 parents d7308bb + e458a15
commit 1d18ddf
Show file tree

Hide file tree

Showing 163 changed files with 0 additions and 9,638 deletions.
diff --git a/bbb-voice-conference/config/app_konference/app_konference-10.04-32.so b/bbb-voice-conference/config/app_konference/app_konference-10.04-32.so
diff --git a/bbb-voice-conference/config/app_konference/app_konference-10.04-64.so b/bbb-voice-conference/config/app_konference/app_konference-10.04-64.so
diff --git a/bbb-voice-conference/config/app_konference/app_konference.so b/bbb-voice-conference/config/app_konference/app_konference.so
diff --git a/bbb-voice-conference/config/asterisk/bbb_extensions.conf b/bbb-voice-conference/config/asterisk/bbb_extensions.conf
diff --git a/bbb-voice-conference/config/asterisk/bbb_sip.conf b/bbb-voice-conference/config/asterisk/bbb_sip.conf
diff --git a/bbb-voice-conference/config/asterisk/bigbluebutton.conf b/bbb-voice-conference/config/asterisk/bigbluebutton.conf
diff --git a/bbb-voice-conference/config/freeswitch/conf.orig/autoload_configs/acl.conf.xml b/bbb-voice-conference/config/freeswitch/conf.orig/autoload_configs/acl.conf.xml
diff --git a/bbb-voice-conference/config/freeswitch/conf.orig/autoload_configs/cdr_csv.conf.xml b/bbb-voice-conference/config/freeswitch/conf.orig/autoload_configs/cdr_csv.conf.xml
diff --git a/bbb-voice-conference/config/freeswitch/conf.orig/autoload_configs/cdr_pg_csv.conf.xml b/bbb-voice-conference/config/freeswitch/conf.orig/autoload_configs/cdr_pg_csv.conf.xml
diff --git a/bbb-voice-conference/config/freeswitch/conf.orig/autoload_configs/cidlookup.conf.xml b/bbb-voice-conference/config/freeswitch/conf.orig/autoload_configs/cidlookup.conf.xml
diff --git a/bbb-voice-conference/config/freeswitch/conf.orig/autoload_configs/conference.conf.xml b/bbb-voice-conference/config/freeswitch/conf.orig/autoload_configs/conference.conf.xml