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
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
src	Merge branch 'html5client-mod-verto-addition' of github.com:perroned/bigbluebutton into webrtc-desktop-temp-4	2015-12-11 17:23:27 +00:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1	2015-10-22 20:46:30 +00:00