Merge remote-tracking branch 'kilandor/master'

This commit is contained in:
FrozenCow 2011-02-24 00:02:15 +01:00
commit 95bf263f11

View File

@ -22,7 +22,7 @@ disable-webserver: false
jsonfile: false jsonfile: false
# How often the json file gets written to(in seconds) # How often the json file gets written to(in seconds)
jsonfile-interval: 1000 jsonfile-interval: 1
# The maptypes Dynmap will use to render. # The maptypes Dynmap will use to render.
worlds: worlds: