From b47cd197cefe8a32a776ab839faf566fab05a768 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Mon, 28 Sep 2020 21:07:08 +0000
Subject: [PATCH 1/2] Fixing FA icon

---
 allianceauth/templates/allianceauth/night-toggle.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allianceauth/templates/allianceauth/night-toggle.html b/allianceauth/templates/allianceauth/night-toggle.html
index f1c2dceb..fc6d3350 100644
--- a/allianceauth/templates/allianceauth/night-toggle.html
+++ b/allianceauth/templates/allianceauth/night-toggle.html
@@ -1,5 +1,5 @@
 {% load i18n %}
 <a href="{% url 'nightmode' %}?next={{ request.path|urlencode }}">
     {% trans "Night" %}
-    <i class="fa {% if NIGHT_MODE %}fa-toggle-on{% else %}fa-toggle-off{% endif %}" aria-hidden="true"></i>
+    <i class="fas {% if NIGHT_MODE %}fa-toggle-on{% else %}fa-toggle-off{% endif %}" aria-hidden="true"></i>
 </a>
\ No newline at end of file

From 1fe0f78ad74839b9b7f4512932340490885d8e32 Mon Sep 17 00:00:00 2001
From: Ariel Rin <ozirascal@gmail.com>
Date: Thu, 1 Oct 2020 01:59:48 +0000
Subject: [PATCH 2/2] Exclude django-redis-cache 2.1.3

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 2f754158..e58e7591 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ install_requires = [
     'django-bootstrap-form',
     'django-registration>=3.1',
     'django-sortedm2m',
-    'django-redis-cache>=2.1.0,<3.0.0',
+    'django-redis-cache>=2.1.0,<3.0.0,!=2.1.3',  # 2.1.3 != Django 3 (Issue 1264)
     'django-celery-beat>=2.0.0',
 
     'openfire-restapi',