Merge branch 'master' into datarestructure

This commit is contained in:
Al Beano
2019-08-11 22:01:29 +01:00
10 changed files with 119 additions and 120 deletions

1
.gitignore vendored
View File

@@ -5,7 +5,6 @@ __pycache__/
conf/config.json
conf/wholist.json
conf/counters.json
conf/masterbuf.json
conf/monitor.json
conf/tokens.json
conf/network.dat