marcia settings fixes #462

Merged

dan merged 2 commits from marcia_fixes into trunk

2022-05-31 23:31:28 +00:00

Author	SHA1	Message	Date
Sarah Jamie Lewis	f5393cdb79	Merge branch 'trunk' into marcia_fixes continuous-integration/drone/pr Build is passing Details	2022-05-31 23:19:49 +00:00
Sarah Jamie Lewis	c0f1b674aa	marcia settings fixes continuous-integration/drone/pr Build was killed Details	2022-05-31 13:37:32 -07:00