bigbluebutton-Github/bigbluebutton-web/grails-app/controllers/org/bigbluebutton
Felipe Cecagno ed366e6b21 Merge branch '090-recordings-size' into mconf-live0.7.3
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
2015-09-08 17:43:20 -03:00
..
web/controllers Merge branch '090-recordings-size' into mconf-live0.7.3 2015-09-08 17:43:20 -03:00