lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed conflict with master

Browse Source
This commit is contained in:
jfederico
2017-08-15 20:44:06 +00:00
parent 9db643a533 0719cbd1bf
commit 22d0f4423d
7 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/en-us.yml
View File

@ -192,6 +192,7 @@ en-US:
wait_for_mod_explanation: You will automatically join when the meeting starts
watch: Watch
'yes': 'Yes'
warning_bigbluebutton_endpoint_default: This deployment of Greenlight is making use of the BigBlueButton testing server that comes pre-configured by default. It should be replaced.
welcome_to_greenlight: Welcome to GreenLight!
youtube_description: This recording was recorded with BigBlueButton. For more information check out %{url}.
youtube_footer: this will upload all webcam and audio data