From 4fecf26047dffe7efb168aca7145a8c1f2261ff9 Mon Sep 17 00:00:00 2001
From: Colin Hughes <colin@w4b.co.uk>
Date: Fri, 2 Oct 2020 11:55:36 +0100
Subject: [PATCH 1/2] added *.sh eol=lf to .gitattributes because several files
 have crlf endings. I tried to commit those files with lf endings but git
 doesn't appear to want to commit those changes. I guess I'd have to make a
 minor change to the each file and I'm relutant to do that.

---
 .gitattributes | 1 +
 CONTRIBUTORS   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index e4d2bbbf7..efde40a76 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 *.ftl eol=lf
+*.sh eol=lf
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b36c6b209..4a2d2b08f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -60,6 +60,7 @@ phwoo <github.com/phwoo>
 Soren Bjornstad <anki@sorenbjornstad.com>
 Aleksa Sarai <cyphar@cyphar.com>
 Jakub Kaczmarzyk <jakub.kaczmarzyk@gmail.com>
+lukkea <github.com/lukkea/>
 
 ********************
 

From a09a70fec2d41f196b3a9e5d5a9453f0b1266124 Mon Sep 17 00:00:00 2001
From: abdo <abd.nh25@gmail.com>
Date: Sat, 3 Oct 2020 00:17:38 +0300
Subject: [PATCH 2/2] Recognize ico files

Local icons were being pasted as normal links previously instead of
being enclosed in img tags.
---
 qt/aqt/editor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 6aeb41743..ec7fe117a 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -43,7 +43,7 @@ from aqt.utils import (
 )
 from aqt.webview import AnkiWebView
 
-pics = ("jpg", "jpeg", "png", "tif", "tiff", "gif", "svg", "webp")
+pics = ("jpg", "jpeg", "png", "tif", "tiff", "gif", "svg", "webp", "ico")
 audio = (
     "wav",
     "mp3",