Felipe Cecagno f6d6e4e40c Merge branch '090-guest-role' into HEAD ... Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy		2015-01-25 18:36:30 -02:00
..
images	Merge branch '090-guest-role' into HEAD	2015-01-25 18:36:30 -02:00
swf	- add default bbb style	2012-12-27 21:36:05 +00:00