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

26d56d34

Commit 26d56d34 authored 6 years ago by Ghazi Triki

Downloads
- Patches
- Plain Diff

Fix merge conflicts.

parent 78847f89

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml 0 additions, 2 deletions

...rc/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml 5 additions, 55 deletions

...ent/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/BroadcastButton.mxml 0 additions, 74 deletions

...g/bigbluebutton/modules/layout/views/BroadcastButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasDisplayModel.as 0 additions, 5 deletions

...button/modules/whiteboard/WhiteboardCanvasDisplayModel.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.as 52 additions, 78 deletions

...igbluebutton/modules/whiteboard/views/WhiteboardCanvas.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml 1 addition, 1 deletion

...luebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as 2 additions, 111 deletions

...on-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as

with 60 additions and 326 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