Skip to content
Snippets Groups Projects
Commit 01b26338 authored by Martin Klampfer's avatar Martin Klampfer
Browse files

Merge branch 'feature/translation-2.3.x' into feature/91/originalVolume-per-channel

# Conflicts:
#	bigbluebutton-html5/imports/ui/components/translations/component.jsx
parents 4b003946 e89eff68
No related branches found
No related tags found
No related merge requests found
Showing
with 191 additions and 73 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 to comment