From: Joe Workman <joe@workmanmail.com>
Date: Mon, 20 Jul 2020 18:38:44 +0000 (-0700)
Subject: Merge branch 'develop' into chore/upgrade-dependencies
X-Git-Tag: v2.3.0^2~9^2~2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a9b295da3b4cf504198042e1e931a27123cb7630;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

Merge branch 'develop' into chore/upgrade-dependencies

# Conflicts:
#	package.json
---

a9b295da3b4cf504198042e1e931a27123cb7630