Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

fairblue
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

e3c54fc2

Commit e3c54fc2 authored 7 years ago by Richard Alam

Downloads
- Patches
- Plain Diff

- fix merge exceptions

parent a2feb9bf

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 3 additions, 3 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala 1 addition, 1 deletion

.../main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala 1 addition, 1 deletion

...org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/AllowedMessageNames.scala 5 additions, 2 deletions

...rg/bigbluebutton/client/meeting/AllowedMessageNames.scala
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml 1 addition, 1 deletion

...g/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml

with 11 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net