]> git.ipfire.org Git - thirdparty/foundation/foundation-emails.git/commit
Merge branch 'chore/upgrade-dependencies' into develop
authorJoe Workman <joe@workmanmail.com>
Mon, 20 Jul 2020 19:54:14 +0000 (12:54 -0700)
committerJoe Workman <joe@workmanmail.com>
Mon, 20 Jul 2020 19:54:14 +0000 (12:54 -0700)
commit7f17302cb75ad5a8fba4a163a92ef213250fe585
tree88ee4f7b2c507313a52134ad30604d01f5cc90a9
parent0de071b774a2a3f6526f4c97042d6714b93d8a35
parent4d39a22e31f9f8ad20492da6c008f71f62df6242
Merge branch 'chore/upgrade-dependencies' into develop

# Conflicts:
# gem/foundation-emails.gemspec
# package.json
# yarn.lock
gem/foundation-emails.gemspec
package.json