Merge pull request #28 from fewlinesco/release/1.2.0

Release 1.2.0
fewlinesco · Aug 2, 2016 · 21df42f · 21df42f
2 parents cb3246f + 3079bcf
commit 21df42f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 1.2.0 - 2016-08-02
+
+* Fix order of name/email in `format_email` function ([#22])
+* Allow username and password configs to be loaded from ENV ([#23])
+* Remove Content-ID SMTP header from email parts ([#24])
+* Bump to Elixir 1.3.2 ([#26])
+* Update to bamboo 0.7.0 ([#27])
+
+[#22]: https://github.com/fewlinesco/bamboo_smtp/pull/22
+[#23]: https://github.com/fewlinesco/bamboo_smtp/pull/23
+[#24]: https://github.com/fewlinesco/bamboo_smtp/pull/24
+[#26]: https://github.com/fewlinesco/bamboo_smtp/pull/26
+[#27]: https://github.com/fewlinesco/bamboo_smtp/pull/27
+
 ## 1.1.0 - 2016-07-18
 
 ### New Additions

diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 [![Build Status](https://travis-ci.org/fewlinesco/bamboo_smtp.svg?branch=master)](https://travis-ci.org/fewlinesco/bamboo_smtp)
-[![Coverage Status](https://coveralls.io/repos/github/fewlinesco/bamboo_smtp/badge.svg?branch=master)](https://coveralls.io/github/fewlinesco/bamboo_smtp?branch=master)
 
 # Bamboo.SMTPAdapter
 
@@ -13,7 +12,7 @@ The package can be installed as:
 
   ```elixir
   def deps do
-    [{:bamboo_smtp, "~> 1.1.0"}]
+    [{:bamboo_smtp, "~> 1.2.0"}]
   end
   ```
 

diff --git a/mix.exs b/mix.exs
@@ -5,7 +5,7 @@ defmodule BambooSmtp.Mixfile do
 
   def project do
     [app: :bamboo_smtp,
-     version: "1.1.0",
+     version: "1.2.0",
      elixir: "~> 1.2",
      source_url: @project_url,
      homepage_url: @project_url,