merge github fork 20211013 conflicts resolved (!2) · Merge requests · Jeff Higgins / docker-simple-mail-forwarder · GitLab

Jeff Higgins requested to merge 20220114-IntermidateBranch into master Jan 14, 2022

Merging new changes from the github repo, last commit 20211013 by Huan

Conflicts have been resolved Conflicts:

Dockerfile
README.md
CHANGELOG.md

Edited Jan 14, 2022 by Jeff Higgins