Merge remote-tracking branch 'origin/master'

da41441a · Weblate · f7d1d5c7 · 3d0f2ce6 · da41441a · da41441a
Commit da41441a authored Sep 04, 2017 by Weblate
Showing with 8 additions and 9 deletions

demo/anonymous.html demo/anonymous.html +2 -2

dist/converse-no-dependencies.js dist/converse-no-dependencies.js +1 -2

index.html index.html +3 -3

inverse.html inverse.html +2 -2

No files found.
--- a/demo/anonymous.html
+++ b/demo/anonymous.html
@@ -12,11 +12,11 @@
    <link type="text/css" rel="stylesheet" media="screen" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
    <link type="text/css" rel="stylesheet" media="screen" href="node_modules/font-awesome/css/font-awesome.min.css" />
    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/theme.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/converse.min.css" />
    <script type="text/javascript" src="../analytics.js"></script>
    <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
    <![if gte IE 9]>
-        <script src="https://cdn.conversejs.org/dist/converse.min.js"></script>
+        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/3.2.1/css/converse.min.css" />
+	<script src="https://cdn.conversejs.org/3.2.1/dist/converse.min.js"></script>
    <![endif]>
 </head>


--- a/dist/converse-no-dependencies.js
+++ b/dist/converse-no-dependencies.js
@@ -6744,8 +6744,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
    };
 });

-//# sourceMappingURL=pluggable.js.map
-;
+//# sourceMappingURL=pluggable.js.map;


 // Converse.js (A browser based XMPP chat client)
--- a/index.html
+++ b/index.html
@@ -14,10 +14,10 @@
    <link type="text/css" rel="stylesheet" media="screen" href="css/theme.min.css" />
    <script type="text/javascript" src="analytics.js"></script>
    <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
-	<script src="src/website.js"></script>
+    <script src="src/website.js"></script>
    <![if gte IE 11]>
-    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
-	<script src="dist/converse.min.js"></script>
+        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/3.2.1/css/converse.min.css" />
+        <script src="https://cdn.conversejs.org/3.2.1/dist/converse.min.js"></script>
    <![endif]>
 </head>


--- a/inverse.html
+++ b/inverse.html
@@ -5,10 +5,10 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <title>inVerse</title>
    <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/3.1.0/css/inverse.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/3.2.1/css/inverse.min.css" />
    <script type="text/javascript" src="inverse-analytics.js"></script>
    <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=5" style="border:0;" alt="" /></p></noscript>
-    <script src="dist/inverse.min.js"></script>
+    <script src="https://cdn.conversejs.org/3.2.1/dist/inverse.min.js"></script>
 </head>
 <body>
    <div class="content">