3 commits

Author	SHA1	Message	Date
RedSparr0w	68707e4047	...	2019-09-26 19:06:27 +12:00
RedSparr0w	c5d4e3d2ff	update default server properties	2019-09-20 09:58:43 +12:00
verinia	101b8314c9	Rebase with upstream	2019-05-28 22:15:17 -08:00