Anton Georgiev
2d89a73c0c
Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
bigbluebutton-web/grails-app/conf/UrlMappings.groovy
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
bigbluebutton-web/ivy.xml
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java