Felipe Cecagno 8e12c909c5 Merge branch '090-encrypted-recording' into HEAD ... Conflicts: bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java record-and-playback/core/Gemfile record-and-playback/deploy.sh		2015-01-21 15:51:29 -02:00
..
.settings	- refactor presentation classes from groovy to java...java has better tool support for eclipse	2009-12-22 21:06:23 +00:00
grails-app	Merge branch '090-encrypted-recording' into HEAD	2015-01-21 15:51:29 -02:00
lib	- follow redirects when downloading presentation	2014-10-22 02:43:03 -07:00
src	Merge branch '090-encrypted-recording' into HEAD	2015-01-21 15:51:29 -02:00
test	sending the externalMeetingId from bbb-web to bbb-apps, so bbb-apps can use it on redis pubsub message meeting_created_message	2014-11-11 17:54:17 -02:00
web-app	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
wrapper	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
.classpath	- modify lib path	2014-10-22 02:44:15 -07:00
.gitignore	- merge some new stuff	2012-07-29 16:06:39 +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	- follow redirects when downloading presentation	2014-10-22 02:43:03 -07: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