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
..
playback/presentation	Merge remote-tracking branch 'mconf' into merging-into-bbb-1.1	2017-06-07 19:31:15 +00:00
scripts	Merge tag 'v1.1.0' into 1.1-transcode	2017-06-13 17:44:12 +00:00