Merge Greg's branch into the master branch #303

Merged

greg6775 merged 4 commits from greg-dev into master 2020-01-04 14:42:58 +01:00

Conversation 0 Commits 4 Files changed 8 +111 -51

4 commits

Author	SHA1	Message	Date
GregTCLTK	e2ebdf20a9	#300	2020-01-04 14:42:09 +01:00
GregTCLTK	7a09a2b1bc	More error messages	2020-01-04 14:39:02 +01:00
GregTCLTK	ba46d948cc	Perm error msg	2020-01-04 13:58:55 +01:00
Skidder	b5f4ed98fa	Merge pull request #298 from BigBotNetwork/hax-dev ... Merged!	2020-01-03 16:00:31 +01:00