]> git.ipfire.org Git - thirdparty/foundation/foundation-emails.git/commit
Merge branch 'develop' into chore/update-dependencies
authorJoe Workman <joe@workmanmail.com>
Mon, 20 Jul 2020 19:43:18 +0000 (12:43 -0700)
committerJoe Workman <joe@workmanmail.com>
Mon, 20 Jul 2020 19:43:18 +0000 (12:43 -0700)
commite79c1064495da806c4f8208907eee13053baf6d6
tree34e48040351543744c5e185cfbfe53ec767df6fb
parentf0cd15c8978cdf5a14da5f7f4da9046047c5c4e5
parentdc84a7e7d8ad8d80ae490665f5dffa0338d4458d
Merge branch 'develop' into chore/update-dependencies

# Conflicts:
# package.json
package.json