Richard Alam d402f7b333 Merge branch 'master' ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml		2013-09-09 18:42:21 +00:00
..
conf	Merge branch 'master'	2013-09-09 18:42:21 +00:00
controllers/org/bigbluebutton/web/controllers	Merge branch 'master'	2013-09-09 18:42:21 +00: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