Merge remote-tracking branch 'upstream/master' into dev-erick

This commit is contained in:
Erick Kad-Bay
2016-11-29 15:27:53 -05:00
6 changed files with 51 additions and 13 deletions

View File

@ -16,11 +16,11 @@
module BbbApi
def bbb_endpoint
Rails.configuration.bigbluebutton_endpoint
Rails.configuration.bigbluebutton_endpoint || ''
end
def bbb_secret
Rails.configuration.bigbluebutton_secret
Rails.configuration.bigbluebutton_secret || ''
end
def bbb