From: Robert Kaiser <kairo@kairo.at>
Date: Fri, 10 Nov 2017 20:19:23 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/lantea
X-Git-Tag: production~22^2~3
X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=commitdiff_plain;h=a1565de42b662fbe8565825aaf2e5619fbb29ac0;hp=1c056e7aecb2121a68f411ccc7e32039ebb63118

Merge branch 'master' of linz:/srv/git/lantea
---

diff --git a/login.html b/login.html
index aa4656e..8eafcbd 100644
--- a/login.html
+++ b/login.html
@@ -11,7 +11,7 @@
   <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, maximum-scale=1, user-scalable=no">
   <title>Lantea Login</title>
   <script src="js/ui.js"></script>
-  <script src="js/piwik.js" async="" defer=""></script>
+  <!-- script src="js/piwik.js" async="" defer=""></script -->
   <link rel="stylesheet" href="style/lantea.css">
   <link rel="shortcut icon" href="style/lanteaIcon16.png" type="image/png">
 </head>