From 2091e6257515a446503dedb2e605e19225234d8a Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Sat, 26 Apr 2014 13:56:50 -0400 Subject: [PATCH 1/2] Added mandrill to features list, updated changelog --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5e015713d9..8e8bbc00e8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Alt](https://lh4.googleusercontent.com/-PVw-ZUM9vV8/UuWeH51os0I/AAAAAAAAD6M/0Ikg7viJftQ/w1286-h566-no/hackathon-starter-logo.jpg) -Hackathon Starter 2.0.3 [![Dependency Status](https://david-dm.org/sahat/hackathon-starter.svg?theme=shields.io)](https://david-dm.org/sahat/hackathon-starter) [![Build Status](https://travis-ci.org/sahat/hackathon-starter.svg?branch=master)](https://travis-ci.org/sahat/hackathon-starter) [![Analytics](https://ga-beacon.appspot.com/UA-47447818-2/hackathon-starter?pixel)](https://github.com/igrigorik/ga-beacon) +Hackathon Starter 2.0.4 [![Dependency Status](https://david-dm.org/sahat/hackathon-starter.svg?theme=shields.io)](https://david-dm.org/sahat/hackathon-starter) [![Build Status](https://travis-ci.org/sahat/hackathon-starter.svg?branch=master)](https://travis-ci.org/sahat/hackathon-starter) [![Analytics](https://ga-beacon.appspot.com/UA-47447818-2/hackathon-starter?pixel)](https://github.com/igrigorik/ga-beacon) ======================= @@ -8,7 +8,7 @@ Hackathon Starter 2.0.3 [![Dependency Status](https://david-dm.org/sahat/hackath -Jump to [What's new in 2.0.3?](#changelog) +Jump to [What's new in 2.0.4?](#changelog) A boilerplate for **Node.js** web applications. @@ -74,7 +74,7 @@ Features - Rails 3.1-style asset pipeline by connect-assets (See FAQ) - LESS stylesheets (auto-compiled without any Gulp/Grunt hassle) - Bootstrap 3 + Flat UI + iOS7 -- Contact Form (powered by Mailgun or Sendgrid) +- Contact Form (powered by Mailgun, Sendgrid or Mandrill) - **Account Management** - Gravatar - Profile Details @@ -1118,9 +1118,12 @@ Add this to `package.json`, after *name* and *version*. This is necessary becaus - To push your changes simply run `git push azure master` - **Note:** *You will be prompted for the password you created earlier* - On **Deployments** tab of your Windows Azure Web Site, you will see the deployment history - +Add Changelog --------- +### 2.0.4 (April 26, 2014) +- Added Mandrill e-mail service (via generator) + ### 2.0.3 (April 25, 2014) - LinkedIn API: Fixed an error if a user did not specify education on LinkedIn - Removed email constraint when linking OAuth accounts in order to be able to merge accounts that use the same email address From e4233714f7445f4c8fb65b20939725615414cd1b Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Sat, 26 Apr 2014 15:03:44 -0400 Subject: [PATCH 2/2] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e8bbc00e8..34f5c7554c 100644 --- a/README.md +++ b/README.md @@ -1118,9 +1118,10 @@ Add this to `package.json`, after *name* and *version*. This is necessary becaus - To push your changes simply run `git push azure master` - **Note:** *You will be prompted for the password you created earlier* - On **Deployments** tab of your Windows Azure Web Site, you will see the deployment history -Add + Changelog --------- + ### 2.0.4 (April 26, 2014) - Added Mandrill e-mail service (via generator)