Merge branch 'develop'

# Conflicts: # package-lock.json # package.json
jgoralcz · Dec 1, 2018 · f9b3cb8 · f9b3cb8
2 parents b7fb0e0 + 908e5aa
commit f9b3cb8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -215,7 +215,7 @@ const question = previousStep.nextQuestion;
 {
   "nextQuestion": "Is your character a female?",
   "progress": "2.43520",
-  "answers": [ "Yes", "No", "Don\'t know", "Probably", "Probably not" ],
+  "answers": [ "Yes", "No", "Don't know", "Probably", "Probably not" ],
   "currentStep": 2,
   "nextStep": 1 
 }

diff --git a/functions/getURL.js b/functions/getURL.js
@@ -55,7 +55,7 @@ exports.regionURL = function (region) {
 
         case "il":
         case "hebrew":
-            id = "srv4.akinator.com:9170";
+            id = "srv12.akinator.com:9189";
             break;
 
         case "it":
@@ -90,7 +90,7 @@ exports.regionURL = function (region) {
 
         case "ru":
         case "russian":
-            id = "srv5.akinator.com:9124";
+            id = "srv12.akinator.com:9190";
             break;
 
         case "tr":
@@ -105,4 +105,4 @@ exports.regionURL = function (region) {
     }
 
     return id;
-};
+};