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

Merge branch 'develop' into chore/update-dependencies

# Conflicts:
#	package.json
---

e79c1064495da806c4f8208907eee13053baf6d6