OSDN Git Service

Merge branch 'develop' into macos-develop
authorEric Branlund <ebranlund@fastmail.com>
Fri, 8 Oct 2021 16:35:18 +0000 (09:35 -0700)
committerEric Branlund <ebranlund@fastmail.com>
Fri, 8 Oct 2021 16:35:18 +0000 (09:35 -0700)

Trivial merge