]> 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: da347ef 19c6bee)
resolved conflicts
authorTim Hartwick <tdhartwick2@gmail.com>
Wed, 6 Jan 2016 17:36:37 +0000 (09:36 -0800)
committerTim Hartwick <tdhartwick2@gmail.com>
Wed, 6 Jan 2016 17:36:37 +0000 (09:36 -0800)
1  2 
foundation-emails-template patch | diff1 | diff2 | blob | history

diff --cc foundation-emails-template
index 7be1038ca4c2269b28cd727100d242e240340c40,20e09b14bd7deb62dc9bbfd32754d664672b741c..ddcb7bb8f510418d51927ad266632d9197bb8ca3
--- 1/foundation-emails-template
--- 2/foundation-emails-template
+++ b/foundation-emails-template
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 7be1038ca4c2269b28cd727100d242e240340c40
 -Subproject commit 20e09b14bd7deb62dc9bbfd32754d664672b741c
++Subproject commit ddcb7bb8f510418d51927ad266632d9197bb8ca3
Mirror of https://github.com/foundation/foundation-emails.git