Pedro Beschorner Marin 17fc566975 Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0 ... Conflicts: bigbluebutton-client/locale/es_LA/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml bigbluebutton-config/web/default.pdf bigbluebutton-config/web/index.html bigbluebutton-web/grails-app/conf/bigbluebutton.properties		2016-06-17 18:00:51 +00:00
..
bbbResources.properties	Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0	2016-06-17 18:00:51 +00:00