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
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0	2016-06-17 18:00:51 +00:00
config.xml.template	Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf	2016-03-02 00:19:30 -03:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00