Pedro Beschorner Marin 4c432ee5bd Merge branch 'feature-1931' into rafafp-branches-merged-1.0 ... Conflicts: bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatToolbar.mxml record-and-playback/presentation/scripts/publish/presentation.rb		2016-06-22 13:06:51 +00:00
..
bbbResources.properties	Merge branch 'feature-1931' into rafafp-branches-merged-1.0	2016-06-22 13:06:51 +00:00