Release 1.1.2

phoenixframework · Jan 8, 2016 · f477067 · f477067
1 parent eebe7d0
commit f477067
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 1.1.2-dev
+## 1.1.2 (2015-1-8)
 
 See these *optional* [`1.1.1` to `1.1.2` upgrade instructions](https://gist.github.com/chrismccord/d5bc5f8e38c8f76cad33) to bring your existing apps up to speed.
 

diff --git a/installer/lib/phoenix_new.ex b/installer/lib/phoenix_new.ex
@@ -460,8 +460,8 @@ defmodule Mix.Tasks.Phoenix.New do
     :crypto.strong_rand_bytes(length) |> Base.encode64 |> binary_part(0, length)
   end
 
-  # defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, "~> 1.1.1"}]
-  defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, github: "phoenixframework/phoenix", override: true}]
+  defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, "~> 1.1.2"}]
+  # defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, github: "phoenixframework/phoenix", override: true}]
   defp phoenix_dep(path), do: ~s[{:phoenix, path: #{inspect path}, override: true}]
 
   defp phoenix_static_path("deps/phoenix"), do: "deps/phoenix"

diff --git a/installer/mix.exs b/installer/mix.exs
@@ -3,7 +3,7 @@ defmodule Phoenix.New.Mixfile do
 
   def project do
     [app: :phoenix_new,
-     version: "1.1.1",
+     version: "1.1.2",
      elixir: "~> 1.0-dev"]
   end
 

diff --git a/mix.exs b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Phoenix.Mixfile do
   use Mix.Project
 
-  @version "1.1.2-dev"
+  @version "1.1.2"
 
   def project do
     [app: :phoenix,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "phoenix",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./priv/static/phoenix.js",
   "repository": {
   },