Richard Alam 433f09f72d Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB ... Conflicts: bbb-common-message/build.sbt bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java		2016-05-20 15:40:50 +00:00
..
conf	bbb-web: Fix for race condition that causes the maxParticipants filter to fail (changed the format to error parameter)	2016-05-18 15:39:34 -04:00
controllers/org/bigbluebutton/web/controllers	Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB	2016-05-20 15:40:50 +00:00
i18n	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services	- remove printlns to cleanup logs	2015-09-23 20:11:06 +00:00
views	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00