Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
fairblue
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hosting
chat
fairblue
Commits
3ac33c79
Commit
3ac33c79
authored
8 years ago
by
Klaus Klein
Browse files
Options
Downloads
Patches
Plain Diff
Fix merge algoritm problem
parent
9649f752
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bigbluebutton-html5/imports/ui/components/chat/container.jsx
+28
-23
28 additions, 23 deletions
bigbluebutton-html5/imports/ui/components/chat/container.jsx
bigbluebutton-html5/imports/ui/components/chat/service.js
+3
-1
3 additions, 1 deletion
bigbluebutton-html5/imports/ui/components/chat/service.js
with
31 additions
and
24 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
