]> git.ipfire.org Git - thirdparty/foundation/foundation-emails.git/commit
Merge branch 'develop' into chore/upgrade-dependencies
authorJoe Workman <joe@workmanmail.com>
Mon, 20 Jul 2020 18:38:44 +0000 (11:38 -0700)
committerJoe Workman <joe@workmanmail.com>
Mon, 20 Jul 2020 18:38:44 +0000 (11:38 -0700)
commita9b295da3b4cf504198042e1e931a27123cb7630
tree79a555a067be45a5aa970e3c27fa5e70b3164d05
parent9c7a976400d74c5ec996ddf487b6e8bb2e207f83
parentdc84a7e7d8ad8d80ae490665f5dffa0338d4458d
Merge branch 'develop' into chore/upgrade-dependencies

# Conflicts:
# package.json
package.json