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
..
.project	Reversed the UTF-16 changes Richard made.	2010-03-23 15:46:15 +00:00
ApiController.groovy	Merge branch 'master'	2013-09-09 18:42:21 +00:00
PresentationController.groovy	Added license for bigbluebutton-web	2013-01-18 18:24:35 -05:00