bigbluebutton-Github/bigbluebutton-web
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
..
grails-app Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB 2016-05-20 15:40:50 +00:00
lib - follow redirects when downloading presentation 2014-10-22 02:43:03 -07:00
src Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB 2016-05-20 15:40:50 +00:00
test This enable avatar to be display in other participants video window 2016-04-20 14:08:13 +08:00
web-app bigbluebutton-web: Validated nulls and empty strings in new template for getRecordings 2016-02-12 12:07:20 -05:00
wrapper - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
.gitignore - fix issue 2812 by setting end time when last user leaves 2016-02-04 22:40:06 +00:00
application.properties After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
build.gradle Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB 2016-05-20 15:40:50 +00:00
COPYING.LESSER - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
grailsw - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
grailsw.bat - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
INSTALL - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00