]> git.ipfire.org Git - thirdparty/foundation/foundation-emails.git/commitdiff
projects / thirdparty / foundation / foundation-emails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c7a976 dc84a7e)
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)
# Conflicts:
# package.json

1  2 
package.json patch | diff1 | diff2 | blob | history

diff --cc package.json
Simple merge
Mirror of https://github.com/foundation/foundation-emails.git