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

b99d0a24

Commit b99d0a24 authored 8 years ago by Lajellu

Downloads
- Plain Diff

HTML5 - Emoji - fix merge conflicts

parents a7afa00b d408bb15

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-html5/client/main.jsx 12 additions, 0 deletions

bigbluebutton-html5/client/main.jsx
bigbluebutton-html5/imports/api/FontControl/index.js 0 additions, 61 deletions

bigbluebutton-html5/imports/api/FontControl/index.js
bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx 8 additions, 0 deletions

...5/imports/ui/components/logout-confirmation/component.jsx
bigbluebutton-html5/imports/ui/components/modal/component.jsx 4 additions, 0 deletions

...luebutton-html5/imports/ui/components/modal/component.jsx
bigbluebutton-html5/imports/ui/components/settings/component.jsx 8 additions, 1 deletion

...button-html5/imports/ui/components/settings/component.jsx
bigbluebutton-html5/imports/ui/components/settings/container.jsx 98 additions, 18 deletions

...button-html5/imports/ui/components/settings/container.jsx
bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx 3 additions, 7 deletions

...ui/components/settings/submenus/application/component.jsx

with 133 additions and 87 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