Felipe Cecagno 25ff17d906 Merge branch '090-guest-role' into mconf-live0.6.2 ... Conflicts: bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.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/branding/default/style/css/BBBDefault.css		2015-01-25 21:01:10 -02:00
..
images	Merge branch '090-guest-role' into mconf-live0.6.2	2015-01-25 21:01:10 -02:00
swf	- add default bbb style	2012-12-27 21:36:05 +00:00