bigbluebutton-Github/bigbluebutton-web/grails-app/controllers/org/bigbluebutton
Felipe Cecagno da8b6efa0e Merge branch 'enter-metadata' into mconf-live0.6.3
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
2015-05-18 12:39:05 -03:00
..
web/controllers Merge branch 'enter-metadata' into mconf-live0.6.3 2015-05-18 12:39:05 -03:00