Merge branch 'master' into v9

2019-07-05 12:30:28 +01:00
parent 80386f1c86 4bae718f40
commit e4e32a9c56
22 changed files with 384 additions and 264 deletions
@@ -81,7 +81,7 @@ class SeasonalWaiter {
        </div>`;
        optionsBody.appendChild(optionItem);

-        if (!this.app.options.hasOwnProperty("clippy")) {
+        if (!("clippy" in this.app.options)) {
            this.app.options.clippy = true;
        }