Skip to content
Snippets Groups Projects
Commit db80cff3 authored by Richard Alam's avatar Richard Alam
Browse files

Merge branch 'master' into consolidate-locales-in-one-area 

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
parents 0d2234d5 7b36c465
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net