Undo config changes from beta branch

Author: threema-danilo

public/i18n/de.json

@@ -40,8 +40,7 @@
         "ALREADY_CONNECTED": "Bereits verbunden",
         "ALREADY_CONNECTED_DETAILS": "Sie sind bereits in einem anderen Tab oder Fenster mit Threema Web verbunden!",
         "VERSION": "Version",
-        "BACKGROUND_IMAGE": "Hintergrundbild",
-        "NOTIFICATION_IOS_BETA": "Um Threema Web mit iOS zu nutzen, benötigen Sie die neueste Beta-Version (Build 2354), ältere Versionen werden nicht mehr unterstützt."
+        "BACKGROUND_IMAGE": "Hintergrundbild"
     },
     "connecting": {
         "CONNECTION_PROBLEMS": "Verbindungsprobleme",

public/i18n/en.json

@@ -40,8 +40,7 @@
         "ALREADY_CONNECTED": "Already connected",
         "ALREADY_CONNECTED_DETAILS": "You are already connected to Threema Web in another tab or window!",
         "VERSION": "Version",
-        "BACKGROUND_IMAGE": "Background Image",
-        "NOTIFICATION_IOS_BETA": "To use Threema Web on iOS, you need the newest build (2354), older builds will not work anymore."
+        "BACKGROUND_IMAGE": "Background Image"
     },
     "connecting": {
         "CONNECTION_PROBLEMS": "Connection problems",

src/config.ts

@@ -14,10 +14,10 @@ export default {
     VERSION_MOUNTAIN_IMAGE_COPYRIGHT: 'CC BY Hans Bühler',
     VERSION_MOUNTAIN_HEIGHT: 2915,
     PREV_PROTOCOL_LAST_VERSION: '1.8.2',
-    GIT_BRANCH: 'beta',
+    GIT_BRANCH: 'master',
 
     // SaltyRTC
-    SALTYRTC_HOST: 'saltyrtc-beta.threema.ch',
+    SALTYRTC_HOST: null,
     SALTYRTC_HOST_PREFIX: 'saltyrtc-',
     SALTYRTC_HOST_SUFFIX: '.threema.ch',
     SALTYRTC_PORT: 443,
@@ -36,7 +36,7 @@ export default {
     }],
 
     // Push
-    PUSH_URL: 'https://push-web-beta.threema.ch/push',
+    PUSH_URL: 'https://push-web.threema.ch/push',
 
     // Debugging options
     DEBUG: false,

src/partials/welcome.html

@@ -6,10 +6,6 @@
                 <p><strong translate>common.NOTE</strong> <span translate>welcome.SAFARI</span></p>
             </div>
 
-            <div class="notification">
-                <p translate>welcome.NOTIFICATION_IOS_BETA</p>
-            </div>
-
             <p class="instructions" translate>welcome.PLEASE_SCAN</p>
             <qrcode version="{{ ctrl.qrCode.version }}"
                     id="connecting-code"
@@ -32,10 +28,6 @@
         </div>
 
         <div ng-if="(ctrl.state === 'new' || ctrl.state === 'connecting') && ctrl.mode === 'unlock'" class="unlock">
-            <div class="notification">
-                <p translate>welcome.NOTIFICATION_IOS_BETA</p>
-            </div>
-
             <h2 class="instructions" translate>welcome.PLEASE_UNLOCK</h2>
             <div class="password-entry">
                 <label>