Pedro Beschorner Marin 15c6420e97 Merge tag 'v1.1.0' into 1.1-transcode ... tagging v1.1.0 release Conflicts: bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java bbb-web-api/src/main/java/org/bigbluebutton/api/messaging/RedisMessagingService.java bigbluebutton-client/resources/config.xml.template bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml record-and-playback/core/scripts/rap-process-worker.rb		2017-06-13 17:44:12 +00:00
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
scala	Block user from joining any breakout room until all of them are created.	2016-08-18 15:12:57 +01:00
src	Merge tag 'v1.1.0' into 1.1-transcode	2017-06-13 17:44:12 +00:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	Upgrade commons-codec dependency version to 1.10	2016-10-05 17:29:37 +01:00