Ghazi Triki 186417fb6f Merge branch 'master-v2' into 2x-client-theme ... # Conflicts: # bigbluebutton-client/src/org/bigbluebutton/common/Images.as # bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatControlBar.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopPublishWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml		2017-07-18 18:38:46 +01:00
..
bbbResources.properties	Merge branch 'master-v2' into 2x-client-theme	2017-07-18 18:38:46 +01:00