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
..
css	Updated landing page for 0.9.0-dev	2014-08-06 23:15:53 +00:00
fonts	Updated landing page for 0.9.0-dev	2014-08-06 23:15:53 +00:00
images	Updates to text and tutorial videos on home page	2014-09-01 20:00:01 -04:00
default.pdf	Added blank pages to defaut.pdf for whiteboard	2016-05-14 09:49:50 -04:00
favicon.ico	Merge branch 'mconf-branding-0.81' into 090-mconf-branding	2014-10-05 19:36:43 -03:00
help.html	- add help.html	2010-04-01 21:34:13 +00:00
index.html	Move from 1.0-RC to 1.0	2016-05-14 09:45:26 -04:00
robots.txt	added robots.txt to root web directory	2010-01-02 16:45:17 +00:00
testjava.html	- change test java link	2013-10-21 21:50:38 +00:00