Merge remote-tracking branch 'origin/master'

* origin/master: fing merges # Conflicts: # menu.db
2020-03-21 21:22:37 +00:00 · 2020-03-21 21:22:37 +00:00 · 13fa38f2b8
commit 13fa38f2b8
parent a4ebf90586 7e5638e155
2 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -162,3 +162,5 @@ artefacts/*.json
 /user/
 /zip
 !/artefacts/
+menu.db
+menu.db.backup
--- a/menu.db
+++ b/menu.db