Merge branch 'master' of github.com:whitef0x0/tellform

2016-05-23 11:59:17 -07:00 · 2016-05-23 11:59:17 -07:00 · 29667e5537
parent b5d7c16649 651fadbe01
commit 29667e5537
8 changed files with 6 additions and 0 deletions
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,6 @@
+Include the following information with your issue:
+
+1) Nodemailer version you are having problems with (eg. v1.3.0)
+2) Node.js version you are using (run node -v to see it, eg v5.5.0) 
+3) Your operating system (eg. Windows 10, Ubuntu 14.04 etc.) 
+4) If possible, include a minimal test case that can be used to verify your issue (link to a gist would be great!)
--- a/design/screenshots/tellform_screenshot1.png
+++ b/design/screenshots/tellform_screenshot1.png
--- a/public/modules/core/img/brand/logo.png
+++ b/public/modules/core/img/brand/logo.png
--- a/public/modules/users/img/buttons/facebook.png
+++ b/public/modules/users/img/buttons/facebook.png
--- a/public/modules/users/img/buttons/github.png
+++ b/public/modules/users/img/buttons/github.png
--- a/public/modules/users/img/buttons/google.png
+++ b/public/modules/users/img/buttons/google.png
--- a/public/modules/users/img/buttons/linkedin.png
+++ b/public/modules/users/img/buttons/linkedin.png
--- a/public/modules/users/img/buttons/twitter.png
+++ b/public/modules/users/img/buttons/twitter.png