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
..
conf	Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release	2015-05-17 19:25:26 -03:00
controllers/org/bigbluebutton/web/controllers	Merge branch 'enter-metadata' into mconf-live0.6.3	2015-05-18 12:39:05 -03:00
i18n	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services	cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code	2015-05-17 23:08:41 -03:00
views	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00