Fixed conflict with master

app/controllers/application_controller.rb

@@ -47,8 +47,13 @@ class ApplicationController < ActionController::Base
   end
   helper_method :user_name_limit
 
-  def qrcode_generation_enabled
+  def bigbluebutton_endpoint_default?
+    Rails.configuration.bigbluebutton_endpoint_default == Rails.configuration.bigbluebutton_endpoint
+  end
+  helper_method :bigbluebutton_endpoint_default?
+
+  def qrcode_generation_enabled?
     Rails.configuration.enable_qrcode_generation
   end
-  helper_method :qrcode_generation_enabled
+  helper_method :qrcode_generation_enabled?
 end

app/controllers/landing_controller.rb

@@ -17,8 +17,6 @@
 class LandingController < ApplicationController
   include BbbApi
 
-  helper_method :admin?
-
   def index
     # If guest access is disabled, redirect the user to the guest landing and force login.
     redirect_to guest_path if Rails.configuration.disable_guest_access
@@ -77,6 +75,7 @@ class LandingController < ApplicationController
   def admin?
     @user && @user == current_user
   end
+  helper_method :admin?
 
   def preferences
     @user = current_user