Pedro Beschorner Marin 1e3f4a1b1d Merge remote-tracking branch 'rafael/fix-1825' into feature-1827 ... Conflicts: bigbluebutton-client/branding/default/style/css/assets/images/status_fail_16px.png bigbluebutton-client/branding/default/style/css/assets/images/status_success_16px.png bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/CustomLayoutNameWindow.mxml		2016-02-05 18:14:41 +00:00
..
bbbResources.properties	Merge remote-tracking branch 'rafael/fix-1825' into feature-1827	2016-02-05 18:14:41 +00:00