bigbluebutton-Github/bigbluebutton-web/grails-app
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
..
conf Added config pngImagesRequired. If true, the slides will be converted to png for HTML5 client. False by default. 2015-01-09 16:14:05 +00:00
controllers/org/bigbluebutton/web/controllers Merge branch '090-encrypted-recording' into HEAD 2015-01-21 15:51:29 -02:00
i18n - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 2014-11-14 15:33:17 -02:00
views - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00