Richard Alam c9b4f7e9a0 Merge branch 'support-multiple-logins' into add-http-to-akka-apps ... Conflicts: bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy		2015-10-21 17:44:44 +00:00
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
scala	- add scala worksheet for testing	2015-10-05 15:23:06 +00:00
src	- play around with akka http	2015-10-20 15:43:41 +00:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	- play around with akka http	2015-10-19 19:00:59 +00:00