Skip to content

Commit

Permalink
Merge 68bef4f into 10f319c
Browse files Browse the repository at this point in the history
  • Loading branch information
liveforeverx committed Sep 28, 2015
2 parents 10f319c + 68bef4f commit eba0641
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@
/tetrapak/.local.cache
mix.lock
rebar.lock
_build
logs
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ defmodule Hello.Mixfile do
[{:lager, "~> 2.1.1", override: true},
{:cowboy, "~> 1.0.2"},
{:yang, github: "travelping/yang", branch: "master"},
{:hackney, "~> 1.1.0"},
{:hackney, "~> 1.3.2"},
{:ex_uri, github: "heroku/ex_uri", branch: "master"},
{:ezmq, github: "RoadRunnr/ezmq", branch: "fix-socket-crash"},
{:jsx, "~> 2.6.2"},
Expand Down

0 comments on commit eba0641

Please sign in to comment.