4 Commits

Author	SHA1	Message	Date
terrafrost	c5d9534ada	fix bad merge	2020-12-13 00:57:30 -06:00
terrafrost	c25dff2ef0	Merge branch '2.0-class-rename' into 3.0-class-rename	2020-12-12 22:26:03 -06:00
terrafrost	1a30cd862f	...	2020-12-12 20:13:42 -06:00
terrafrost	e4bf7b111a	Merge branch '2.0' into 3.0	2020-12-12 19:22:36 -06:00