f8e63fd6f4
Conflicts: bigbluebutton-client/build.xml bigbluebutton-client/locale/ar_SY/bbbResources.properties bigbluebutton-client/locale/az_AZ/bbbResources.properties bigbluebutton-client/locale/bg_BG/bbbResources.properties bigbluebutton-client/locale/ca_ES/bbbResources.properties bigbluebutton-client/locale/cs_CZ/bbbResources.properties bigbluebutton-client/locale/da_DK/bbbResources.properties bigbluebutton-client/locale/de_DE/bbbResources.properties bigbluebutton-client/locale/el_GR/bbbResources.properties bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/es_ES/bbbResources.properties bigbluebutton-client/locale/es_LA/bbbResources.properties bigbluebutton-client/locale/et_EE/bbbResources.properties bigbluebutton-client/locale/eu_EU/bbbResources.properties bigbluebutton-client/locale/fa_IR/bbbResources.properties bigbluebutton-client/locale/fi_FI/bbbResources.properties bigbluebutton-client/locale/fr_CA/bbbResources.properties bigbluebutton-client/locale/fr_FR/bbbResources.properties bigbluebutton-client/locale/he_IL/bbbResources.properties bigbluebutton-client/locale/hr_HR/bbbResources.properties bigbluebutton-client/locale/hu_HU/bbbResources.properties bigbluebutton-client/locale/id_ID/bbbResources.properties bigbluebutton-client/locale/it_IT/bbbResources.properties bigbluebutton-client/locale/ja_JP/bbbResources.properties bigbluebutton-client/locale/kk_KZ/bbbResources.properties bigbluebutton-client/locale/km_KH/bbbResources.properties bigbluebutton-client/locale/ko_KR/bbbResources.properties bigbluebutton-client/locale/lt_LT/bbbResources.properties bigbluebutton-client/locale/lv_LV/bbbResources.properties bigbluebutton-client/locale/mn_MN/bbbResources.properties bigbluebutton-client/locale/ne_NE/bbbResources.properties bigbluebutton-client/locale/nl_NL/bbbResources.properties bigbluebutton-client/locale/no_NO/bbbResources.properties bigbluebutton-client/locale/pl_PL/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/locale/pt_PT/bbbResources.properties bigbluebutton-client/locale/ro_RO/bbbResources.properties bigbluebutton-client/locale/ru_RU/bbbResources.properties bigbluebutton-client/locale/si_LK/bbbResources.properties bigbluebutton-client/locale/sk_SK/bbbResources.properties bigbluebutton-client/locale/sr_RS/bbbResources.properties bigbluebutton-client/locale/sv_SE/bbbResources.properties bigbluebutton-client/locale/th_TH/bbbResources.properties bigbluebutton-client/locale/tr_TR/bbbResources.properties bigbluebutton-client/locale/uk_UA/bbbResources.properties bigbluebutton-client/locale/vi_VN/bbbResources.properties bigbluebutton-client/locale/zh_CN/bbbResources.properties bigbluebutton-client/locale/zh_TW/bbbResources.properties bigbluebutton-client/resources/prod/MconfLive.html bigbluebutton-client/resources/prod/lib/bbb_blinker.js bigbluebutton-client/src/BigBlueButton.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml bigbluebutton-web/grails-app/conf/bigbluebutton.properties record-and-playback/presentation/playback/presentation/playback.html |
||
|---|---|---|
| .. | ||
| spring | ||
| bigbluebutton.properties | ||
| BootStrap.groovy | ||
| BuildConfig.groovy | ||
| Config.groovy | ||
| DataSource.groovy | ||
| log4j.properties | ||
| UrlMappings.groovy | ||