Richard Alam b86f32b8c1 Sync with upstream repository ... Merge branch 'master' of github.com:bigbluebutton/bigbluebutton		2016-04-26 20:01:20 -04:00
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
scala	Merge branch 'breakout-rooms-porto-algre-2015' of https://github.com/riadvice/bigbluebutton into breakout-rooms-porto-algre-2015	2016-02-01 16:12:06 +00:00
src	Merge into bbb-1.1.dev	2016-03-21 18:12:30 +00:00
.cache-main	Merge 'branch air-ui' into 'mobile-client'	2016-04-26 09:19:17 +01:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	Merge into bbb-1.1.dev	2016-03-21 18:12:30 +00:00