Merge branch 'master' into add-type-hints-for-qt-models

2020-07-30 16:05:55 +10:00 · 2020-07-30 16:05:55 +10:00 · f52a25d80a
commit f52a25d80a
parent 04d09ed2ed 7d6aed7849
2 changed files with 7 additions and 0 deletions
--- a/2
+++ b/2
@ -45,7 +45,9 @@ Andreas Reis <github.com/rathsky>
 Matt Krump <github.com/mkrump>
 Alexander Presnyakov <flagist0@gmail.com>
 abdo <github.com/ANH25>
+aplaice <plaice.adam+github@gmail.com>
 phwoo <github.com/phwoo>
+
 ********************

 The text of the 3 clause BSD license follows:
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@ -58,6 +58,11 @@ audio = (
    "spx",
    "oga",
    "webm",
+    "mpg",
+    "ogx",
+    "avi",
+    "flv",
+    "ogv",
 )

 _html = """