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

09147faa

Commit 09147faa authored 6 years ago by Bobak Oftadeh

Downloads
- Patches
- Plain Diff

Fixed conflicts after merge

parent e4d97538

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx 10 additions, 25 deletions

.../ui/components/actions-bar/actions-dropdown/component.jsx
bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx 8 additions, 4 deletions

...ebutton-html5/imports/ui/components/nav-bar/component.jsx
bigbluebutton-html5/package-lock.json 23 additions, 23 deletions

bigbluebutton-html5/package-lock.json

with 41 additions and 52 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