Felipe Cecagno 65163c49ef Merge branch 'master' into guest-role-0.81 ... Conflicts: bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/events/LogoutEvent.as bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml		2013-08-26 15:13:38 -03:00
..
conf	Merge branch 'master' into guest-role-0.81	2013-08-26 15:13:38 -03:00
controllers/org/bigbluebutton/web/controllers	Merge branch 'master' into guest-role-0.81	2013-08-26 15:13:38 -03:00
i18n	- bringing bigbluebutton-web into trunk	2009-04-01 16:53:45 +00:00
services/org/bigbluebutton/web/services	Added license for bigbluebutton-web	2013-01-18 18:24:35 -05:00
views	- bbb-scheduling has been removed from bbb-web	2010-07-19 19:27:24 +00:00