Commit 2ebca81236d25d08b3c31a60799d721c39a85290

Stephen Moloney 2017-02-17T11:35:22

minor changes

diff --git a/.gitignore b/.gitignore
index 7249abc..6a5c62d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,4 @@ erl_crash.dump
 *.secret.exs
 dev.exs
 .env
-mix.lock
 todo.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92cbe95..984992c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+
+## v0.2.1
+
+[neutral changes]
+- Update some dependencies
+- Relax versioning of some dependencies
+- Include `mix.lock` in version control
+
+
 ## v0.2
 
 [enhancements]
diff --git a/mix.exs b/mix.exs
index a20459a..41b9fc3 100644
--- a/mix.exs
+++ b/mix.exs
@@ -29,9 +29,9 @@ defmodule ExOvh.Mixfile do
       {:calendar, "~> 0.17"},
       {:og, "~> 0.1"},
       {:morph, "~> 0.1"},
-      {:poison, "~> 1.5 or ~> 2.0"},
-      {:httpoison, "~> 0.8.0"},
-      {:floki, "~> 0.14.0"},
+      {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0"},
+      {:httpoison, "~> 0.8 or ~> 0.9 or ~> 0.10"},
+      {:floki, "~> 0.14"},
 
       {:markdown, github: "devinus/markdown", only: :dev},
       {:ex_doc,  "~> 0.11", only: :dev}
diff --git a/mix.lock b/mix.lock
new file mode 100644
index 0000000..a6e2170
--- /dev/null
+++ b/mix.lock
@@ -0,0 +1,18 @@
+%{"calendar": {:hex, :calendar, "0.17.1", "5c7dfffde2b68011c2d6832ff1a15496292de965a3b57b3fad32405f1176f024", [:mix], [{:tzdata, "~> 0.5.8 or ~> 0.1.201603", [hex: :tzdata, optional: false]}]},
+  "certifi": {:hex, :certifi, "0.7.0", "861a57f3808f7eb0c2d1802afeaae0fa5de813b0df0979153cbafcd853ababaf", [:rebar3], []},
+  "earmark": {:hex, :earmark, "1.1.1", "433136b7f2e99cde88b745b3a0cfc3fbc81fe58b918a09b40fce7f00db4d8187", [:mix], []},
+  "ex_doc": {:hex, :ex_doc, "0.14.5", "c0433c8117e948404d93ca69411dd575ec6be39b47802e81ca8d91017a0cf83c", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, optional: false]}]},
+  "floki": {:hex, :floki, "0.14.0", "91a6be57349e10a63cf52d7890479a19012cef9185fa93c305d4fe42e6a50dee", [:mix], [{:mochiweb, "~> 2.15", [hex: :mochiweb, optional: false]}]},
+  "hackney": {:hex, :hackney, "1.6.5", "8c025ee397ac94a184b0743c73b33b96465e85f90a02e210e86df6cbafaa5065", [:rebar3], [{:certifi, "0.7.0", [hex: :certifi, optional: false]}, {:idna, "1.2.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]},
+  "hoedown": {:git, "https://github.com/hoedown/hoedown.git", "980b9c549b4348d50b683ecee6abee470b98acda", []},
+  "httpoison": {:hex, :httpoison, "0.11.0", "b9240a9c44fc46fcd8618d17898859ba09a3c1b47210b74316c0ffef10735e76", [:mix], [{:hackney, "~> 1.6.3", [hex: :hackney, optional: false]}]},
+  "idna": {:hex, :idna, "1.2.0", "ac62ee99da068f43c50dc69acf700e03a62a348360126260e87f2b54eced86b2", [:rebar3], []},
+  "markdown": {:git, "https://github.com/devinus/markdown.git", "38dc74c88d52fd7569ad4f63d32b344d35a7fcce", []},
+  "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], []},
+  "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
+  "mochiweb": {:hex, :mochiweb, "2.15.0", "e1daac474df07651e5d17cc1e642c4069c7850dc4508d3db7263a0651330aacc", [:rebar3], []},
+  "morph": {:hex, :morph, "0.1.0", "d00baf76bcd05f10e3393931bda9f127735d721738024a865b84932e063e6abd", [:mix], []},
+  "og": {:hex, :og, "0.1.0", "e21cbb6fd0130a43308f922b482b83bcf03000a154af633e3b98445147ea737b", [:mix], []},
+  "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], []},
+  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], []},
+  "tzdata": {:hex, :tzdata, "0.5.10", "087e8dfe8c0283473115ad8ca6974b898ecb55ca5c725427a142a79593391e90", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, optional: false]}]}}