Merge branch 'develop' into 'docs/improve-mailer-settings-desc'
authorfeld <feld@feld.me>
Mon, 8 Feb 2021 16:43:04 +0000 (16:43 +0000)
committerfeld <feld@feld.me>
Mon, 8 Feb 2021 16:43:04 +0000 (16:43 +0000)
commit85cb122986087062a192c31bc517f2698239819c
tree9f94d0bbf7bf8f68c272b43a779e49a4892e55b6
parent4dbb08a19f57e720e299608ebeb4387d37c55e99
parent8babd796da46975c2d976cf87dad844c13e8a69e
Merge branch 'develop' into 'docs/improve-mailer-settings-desc'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md