BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5bf05161af
bigbluebutton-Github/akka-bbb-apps/src
History
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
templates - move bbb-apps-akka out of labs 2015-06-09 18:49:47 +00:00
test - move bbb-apps-akka out of labs 2015-06-09 18:49:47 +00:00
universal/conf - move bbb-apps-akka out of labs 2015-06-09 18:49:47 +00:00