Skip to content

S
srvpro
Commit e48aa151 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'mc'

parents d95170bf fe4de6dc
Pipeline #13285 failed with stages
          in 6 minutes and 17 seconds
          Show whitespace changes
          Inline Side-by-side
          Showing with 2 additions and 2 deletions
          ygopro-server.coffee
          View file @ e48aa151
          ...@@ -336,7 +336,7 @@ init = () -> ...@@ -336,7 +336,7 @@ init = () ->
          imported = true imported = true
          #import the old Challonge api key option #import the old Challonge api key option
          if settings.modules.challonge.options if settings.modules.challonge.options
          settings.modules.challonge.api_key = settings.modules.challonge.options.api_key settings.modules.challonge.api_key = settings.modules.challonge.options.apiKey
          delete settings.modules.challonge.options delete settings.modules.challonge.options
          imported = true imported = true
          #import the old random_duel.blank_pass_match option #import the old random_duel.blank_pass_match option
          ......
          ygopro-server.js
          View file @ e48aa151
          ...@@ -438,7 +438,7 @@ ...@@ -438,7 +438,7 @@
          } }
          //import the old Challonge api key option //import the old Challonge api key option
          if (settings.modules.challonge.options) { if (settings.modules.challonge.options) {
          settings.modules.challonge.api_key = settings.modules.challonge.options.api_key; settings.modules.challonge.api_key = settings.modules.challonge.options.apiKey;
          delete settings.modules.challonge.options; delete settings.modules.challonge.options;
          imported = true; imported = true;
          } }
          ......
          Markdown is supported
          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