Merge branch 'master' into feature/defaultsearchprovider

2021-06-21 20:16:40 +02:00 · 2021-06-21 20:16:40 +02:00 · 0ce5d3aea6
commit 0ce5d3aea6
parent 3138c18021 0612312e13
53 changed files with 2934 additions and 1856 deletions
--- a/data/greeter.json
+++ b/data/greeter.json
@ -42,7 +42,7 @@
      {
        "greeting": "Good evening!",
        "start": 18,
-        "end": 0
+        "end": 24
      }
    ],
    "dateformat": "%wd, %m %d%e %y"