Anton Georgiev 8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 ... Conflicts: akka-bbb-apps/build.sbt akka-bbb-fsesl/build.sbt bbb-common-message/build.sbt bigbluebutton-apps/build.gradle		2015-10-22 20:46:30 +00:00
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
src	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1	2015-10-22 20:46:30 +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