BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dec98ab7cf
bigbluebutton-Github/bigbluebutton-config
History
Felipe Cecagno 2a3b95daf7 Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-config/bin/bbb-conf
2016-01-26 18:33:31 -02:00
..
bin Merge remote-tracking branch 'bigbluebutton/master' into mconf 2016-01-26 18:33:31 -02:00
cron.daily Added check to restart libreoffice if no users are logged in 2016-01-10 18:41:30 -05:00
record added chrome plugin patch for test recording 2010-11-19 05:04:16 +00:00
slides moving these configuration files into git 2010-09-18 23:24:04 +00:00
web Update index.html 2015-10-05 11:44:47 -04:00
bigbluebutton-release bump from 1.0.0-dev to 1.0.0-beta 2015-09-23 18:00:16 -04:00
check-localization-keys.txt remove and add strings for the localization file 2013-05-27 17:56:48 -05:00