Merge remote-tracking branch 'origin/master'
* origin/master: fing merges # Conflicts: # menu.db
This commit is contained in:
commit
13fa38f2b8
2
.gitignore
vendored
2
.gitignore
vendored
@ -162,3 +162,5 @@ artefacts/*.json
|
|||||||
/user/
|
/user/
|
||||||
/zip
|
/zip
|
||||||
!/artefacts/
|
!/artefacts/
|
||||||
|
menu.db
|
||||||
|
menu.db.backup
|
||||||
|
Loading…
Reference in New Issue
Block a user