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

2016-11-29 15:27:53 -05:00
parent 067f5f1a08 ffddb0e834
commit 44701c0cd9
6 changed files with 51 additions and 13 deletions
--- a/app/lib/bbb_api.rb
+++ b/app/lib/bbb_api.rb
@@ -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