Merge branch 'master' into fix-ui-scale

2020-10-03 09:44:04 +10:00 · 2020-10-03 09:44:04 +10:00 · 49071ebf44
commit 49071ebf44
parent b2870dcd7f af911aa669
3 changed files with 3 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1,2 @@
 *.ftl eol=lf
+*.sh eol=lf
--- a/1
+++ b/1
@ -61,6 +61,7 @@ Soren Bjornstad <anki@sorenbjornstad.com>
 Aleksa Sarai <cyphar@cyphar.com>
 Jakub Kaczmarzyk <jakub.kaczmarzyk@gmail.com>
 Akshara Balachandra <akshara.bala.18@gmail.com>
+lukkea <github.com/lukkea/>

 ********************

--- 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",