From 57e4d6f86f1c4733ec024124f38f102b87040fb7 Mon Sep 17 00:00:00 2001
From: Thomas Gautier <thomas@gautier.gg>
Date: Fri, 7 Jul 2017 13:16:04 +0200
Subject: [PATCH] Bump to v1.5.0-rc.1

---
 CHANGELOG.md | 12 ++++++++++++
 mix.exs      |  2 +-
 mix.lock     |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e35759..983aa4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 1.5.0-rc.1 - 2017-07-07
+
+* Upgrading bamboo to 1.0.0-rc ([#67])
+* Add Hex.pm badge with package version ([#66])
+* Add a CONTRIBUTING guide ([#65])
+* Create CODE_OF_CONDUCT.md ([#64])
+
+[#67]: https://github.com/fewlinesco/bamboo_smtp/pull/67
+[#66]: https://github.com/fewlinesco/bamboo_smtp/pull/66
+[#65]: https://github.com/fewlinesco/bamboo_smtp/pull/65
+[#64]: https://github.com/fewlinesco/bamboo_smtp/pull/64
+
 ## 1.4.0 - 2017-06-15
 
 * Add system env to all configs ([#49])
diff --git a/mix.exs b/mix.exs
index 0fce789..c099628 100644
--- a/mix.exs
+++ b/mix.exs
@@ -5,7 +5,7 @@ defmodule BambooSmtp.Mixfile do
 
   def project do
     [app: :bamboo_smtp,
-     version: "1.4.0",
+     version: "1.5.0-rc.1",
      elixir: ">= 1.2.3",
      source_url: @project_url,
      homepage_url: @project_url,
diff --git a/mix.lock b/mix.lock
index 8aa855c..c77921b 100644
--- a/mix.lock
+++ b/mix.lock
@@ -13,9 +13,9 @@
   "idna": {:hex, :idna, "5.0.2", "ac203208ada855d95dc591a764b6e87259cb0e2a364218f215ad662daa8cd6b4", [:rebar3], [{:unicode_util_compat, "0.2.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
   "inch_ex": {:hex, :inch_ex, "0.5.5", "b63f57e281467bd3456461525fdbc9e158c8edbe603da6e3e4671befde796a3d", [:mix], [{:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
   "jsx": {:hex, :jsx, "2.8.1", "1453b4eb3615acb3e2cd0a105d27e6761e2ed2e501ac0b390f5bbec497669846", [:mix, :rebar3], [], "hexpm"},
-  "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"},
+  "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [], [], "hexpm"},
   "mime": {:hex, :mime, "1.1.0", "01c1d6f4083d8aa5c7b8c246ade95139620ef8effb009edde934e0ec3b28090a", [:mix], [], "hexpm"},
-  "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], [], "hexpm"},
+  "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [], [], "hexpm"},
   "plug": {:hex, :plug, "1.3.5", "7503bfcd7091df2a9761ef8cecea666d1f2cc454cbbaf0afa0b6e259203b7031", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1", [hex: :cowboy, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}], "hexpm"},
   "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], [], "hexpm"},