Commit 214357ad authored 8 years ago by Gabriel Carvalho de Campes

Fix conflicts

parents 5aaafa82 27eac5fa

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java 1 addition, 1 deletion

...ebutton/freeswitch/voice/freeswitch/ESLEventListener.java
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala 2 additions, 2 deletions

...gbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserJoinedVoiceConfMessage.java 2 additions, 1 deletion

...luebutton/common/messages/UserJoinedVoiceConfMessage.java
bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/ConnectionInvokerService.java 2 additions, 2 deletions

...button/app/screenshare/red5/ConnectionInvokerService.java
bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppAdapter.java 1 addition, 20 deletions

...rg/bigbluebutton/app/screenshare/red5/Red5AppAdapter.java
bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java 15 additions, 7 deletions

...rg/bigbluebutton/app/screenshare/red5/Red5AppService.java
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java 54 additions, 121 deletions

...in/java/org/bigbluebutton/app/video/VideoApplication.java
bbb.sh 2 additions, 4 deletions

bbb.sh
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java 57 additions, 25 deletions

...java/org/bigbluebutton/red5/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java 12 additions, 28 deletions

...utton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java 3 additions, 4 deletions

...uebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
bigbluebutton-client/locale/.gitignore 2 additions, 0 deletions

bigbluebutton-client/locale/.gitignore
bigbluebutton-client/locale/am_ET/bbbResources.properties 121 additions, 38 deletions

bigbluebutton-client/locale/am_ET/bbbResources.properties
bigbluebutton-client/locale/ar_EG/bbbResources.properties 121 additions, 38 deletions

bigbluebutton-client/locale/ar_EG/bbbResources.properties
bigbluebutton-client/locale/ar_SA/bbbResources.properties 121 additions, 38 deletions

bigbluebutton-client/locale/ar_SA/bbbResources.properties
bigbluebutton-client/locale/az_AZ/bbbResources.properties 121 additions, 38 deletions

bigbluebutton-client/locale/az_AZ/bbbResources.properties
bigbluebutton-client/locale/be_BY/bbbResources.properties 121 additions, 38 deletions

bigbluebutton-client/locale/be_BY/bbbResources.properties
bigbluebutton-client/locale/bg_BG/bbbResources.properties 158 additions, 75 deletions

bigbluebutton-client/locale/bg_BG/bbbResources.properties
bigbluebutton-client/locale/bn_IN/bbbResources.properties 121 additions, 38 deletions

bigbluebutton-client/locale/bn_IN/bbbResources.properties
bigbluebutton-client/locale/bs_BA/bbbResources.properties 121 additions, 38 deletions

bigbluebutton-client/locale/bs_BA/bbbResources.properties

with 1158 additions and 556 deletions

Please register or to comment