From fb7ccff5847658a6fd6b25b57c8f3ddb5f08c172 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Mon, 9 Apr 2018 01:11:45 +0530
Subject: [PATCH 1/3] remove old migrations from squashed migration

---
 datacenterlight/migrations/0018_auto_20180403_1930.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/datacenterlight/migrations/0018_auto_20180403_1930.py b/datacenterlight/migrations/0018_auto_20180403_1930.py
index 5c418898..a894c66b 100644
--- a/datacenterlight/migrations/0018_auto_20180403_1930.py
+++ b/datacenterlight/migrations/0018_auto_20180403_1930.py
@@ -8,8 +8,6 @@ import django.db.models.deletion
 
 class Migration(migrations.Migration):
 
-    replaces = [('datacenterlight', '0018_auto_20180403_1930'), ('datacenterlight', '0019_auto_20180403_2054')]
-
     dependencies = [
         ('datacenterlight', '0017_auto_20180329_0056'),
         ('sites', '0002_alter_domain_unique'),

From f4b6949d3922496cd5f2225c8205abb71c706d98 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Mon, 9 Apr 2018 02:16:57 +0530
Subject: [PATCH 2/3] corrected favicon link on pages

---
 .../templates/new_base_glarus_c.html          | 26 +++++++++----------
 .../cms/ungleichch/base_ungleich.html         |  2 ++
 .../templates/ungleich_page/404.html          |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/digitalglarus/templates/new_base_glarus_c.html b/digitalglarus/templates/new_base_glarus_c.html
index edef1751..918b27b0 100644
--- a/digitalglarus/templates/new_base_glarus_c.html
+++ b/digitalglarus/templates/new_base_glarus_c.html
@@ -57,7 +57,7 @@
       ga('send', 'pageview');
 
     </script>
-    <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="{% static 'digitalglarus/img/favicon.ico' %}" type="image/x-icon">
     <style id="igtranslator-color" type="text/css"></style>
     <style type="text/css">
 
@@ -87,10 +87,10 @@
         height: 100%;
         margin: 0px;
         padding: 0px;
-        overflow-x: hidden; 
+        overflow-x: hidden;
         }
 
-      @media only screen and (min-width: 769px){ 
+      @media only screen and (min-width: 769px){
         .dropdown.home-dropdown-mobile {
           display:  none;
         }
@@ -99,10 +99,10 @@
         }
       }
 
-      @media only screen and (max-width: 768px){ 
+      @media only screen and (max-width: 768px){
         .dropdown.home-dropdown-mobile {
           display: block;
-          background-color: 
+          background-color:
         }
 
         .dropdown.home-dropdown-mobile .dropdown-menu{
@@ -164,7 +164,7 @@
           <a class="page-scroll" href="#contact">Contact</a>
         </li>
 
-		
+
         {% if request.user.is_authenticated %}
 		<li class="dropdown home-dropdown-mobile open">
           <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
@@ -177,7 +177,7 @@
               </a>
             </li>
             <li>
-              <a href="{% url 'digitalglarus:membership_orders_list' %}"><i class="fa fa-heart-o" aria-hidden="true"></i> {% trans "Membership"%} 
+              <a href="{% url 'digitalglarus:membership_orders_list' %}"><i class="fa fa-heart-o" aria-hidden="true"></i> {% trans "Membership"%}
               </a>
             </li>
             <li>
@@ -200,7 +200,7 @@
               </a>
             </li>
             <li>
-              <a href="{% url 'digitalglarus:membership_orders_list' %}"><i class="fa fa-heart-o" aria-hidden="true"></i> {% trans "Membership"%} 
+              <a href="{% url 'digitalglarus:membership_orders_list' %}"><i class="fa fa-heart-o" aria-hidden="true"></i> {% trans "Membership"%}
               </a>
             </li>
             <li>
@@ -210,11 +210,11 @@
               </a>
             </li>
           </ul>
-        </li>              
+        </li>
         {% else %}
             <li>
                 <a class="page-scroll" href="{% url 'digitalglarus:login' %}">Login</a>
-            </li> 
+            </li>
         {% endif %}
 <!--          <li>
           <a class="page-scroll" href="{% url 'digitalglarus:signup' %}">Sign Up</a>
@@ -227,7 +227,7 @@
     </nav>
 
     {% block content %} {% endblock %}
-    
+
     <footer>
       <div class="container">
     <div class="row">
@@ -255,7 +255,7 @@
     </div>
       </div>
     </footer>
-        
+
 <script type="text/javascript" src="{% static 'digitalglarus/bower_components/jquery/dist/jquery.min.js' %}"></script>
 
 <!-- jQuery -->
@@ -295,7 +295,7 @@
 <script type="text/javascript" src="//cdn.jsdelivr.net/jquery/1/jquery.min.js"></script>
 <script type="text/javascript" src="//cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
 <!-- <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/bootstrap/latest/css/bootstrap.css" />
- --> 
+ -->
 <!-- Include Date Range Picker -->
 <script type="text/javascript" src="//cdn.jsdelivr.net/bootstrap.daterangepicker/2/daterangepicker.js"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.42/js/bootstrap-datetimepicker.min.js
diff --git a/ungleich/templates/cms/ungleichch/base_ungleich.html b/ungleich/templates/cms/ungleichch/base_ungleich.html
index ac073c4c..e19e7421 100644
--- a/ungleich/templates/cms/ungleichch/base_ungleich.html
+++ b/ungleich/templates/cms/ungleichch/base_ungleich.html
@@ -35,6 +35,8 @@
     {% render_block "external-css" %}
     {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
 
+    <link rel="shortcut icon" href="{% static 'ungleich_page/img/favicon.ico' %}"/>
+
     <!-- Google analytics -->
     {% include "google_analytics.html" %}
     <!-- End Google Analytics -->
diff --git a/ungleich_page/templates/ungleich_page/404.html b/ungleich_page/templates/ungleich_page/404.html
index 3eebc2a0..0af5fa25 100644
--- a/ungleich_page/templates/ungleich_page/404.html
+++ b/ungleich_page/templates/ungleich_page/404.html
@@ -23,7 +23,7 @@
     <!-- External Fonts -->
     <link href="//fonts.googleapis.com/css?family=Lato:300,400,600,700" rel="stylesheet" type="text/css">
 
-    <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="{% static 'ungleich_page/img/favicon.ico' %}" type="image/x-icon" />
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

From f9ce871c5d057b7cf51ef88d1218109940893d01 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Mon, 9 Apr 2018 02:18:34 +0530
Subject: [PATCH 3/3] update changelog

---
 Changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Changelog b/Changelog
index 49459422..1d9ae467 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+next:
+    * #4396: [ungleich] add favicon to ungleich blog
 1.6.4: 2018-04-06
     * #4362: [cms] Fix the need of dummy home page for different CMS-based sites
 1.6.3: 2018-04-05