Merge branch 'trunk' of invictus.wa.us.umbrellix.net:nightmaremail into trunk - nightmaremail - Unnamed repository; edit this file 'description' to name the repository.

commit c4fc6a292498dc05991e869b73bdee9eeb703165
parent 096cd9af57fb7b581b19324a7e7922c1ad92e734
Author: Ellenor Malik <ellenor@umbrellix.net>
Date:   Fri,  7 Oct 2022 02:46:52 +0000

Merge branch 'trunk' of invictus.wa.us.umbrellix.net:nightmaremail into trunk

	nightmaremail Unnamed repository; edit this file 'description' to name the repository.
	Log \| Files \| Refs