Richard Alam 6aab83589a Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1 ... Conflicts: bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as		2016-08-17 18:40:28 +00:00
..
core	Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1	2016-08-17 18:40:28 +00:00
endpoint/redis	- use spray json to decode messages	2015-11-17 02:11:14 -05:00
Boot.scala	Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds	2016-05-18 15:14:04 +00:00
SystemConfiguration.scala	config updates	2016-05-27 14:30:16 -04:00