Anton Georgiev 5bf05161af Merge branch 'html5client-mod-verto-addition' of github.com:perroned/bigbluebutton into webrtc-desktop-temp-4 ... Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala		2015-12-11 17:23:27 +00:00
..
main	Merge branch 'html5client-mod-verto-addition' of github.com:perroned/bigbluebutton into webrtc-desktop-temp-4	2015-12-11 17:23:27 +00:00
test	- try to upgrade bbb-apps to using akka	2015-05-11 22:24:33 +00:00