BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d23fcbdf43
bigbluebutton-Github/deskshare
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
..
app - expire redis recording keys after 14 days 2016-01-21 20:43:28 +00:00
applet Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge 2015-11-25 15:58:36 +00:00
common After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
.gitignore
build.gradle - update jar to latest red5 2015-08-10 21:32:00 +00:00
settings.gradle
vm-build.sh