summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2015-05-19 08:47:58 -0400
committerFred Hebert <mononcqc@ferd.ca>2015-05-19 08:47:58 -0400
commit76dafaffcd957e35a3844294b1cacf92bba02cc6 (patch)
tree7c3fd8a23357ea4fba9a2a0788517a604ea25d84
parenta7a0f0d4b046dcd11e99b628fffc1e0f559e3db8 (diff)
parentd3d18e002982626e4173fea0df72c6c4b923b9a6 (diff)
Merge pull request #446 from tsloughter/relx_upgrade
update relx version. fixes #434
-rw-r--r--rebar.config2
-rw-r--r--rebar.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/rebar.config b/rebar.config
index 504a462..b885002 100644
--- a/rebar.config
+++ b/rebar.config
@@ -10,7 +10,7 @@
{tag, "v1.3.1"}}},
{relx, "",
{git, "https://github.com/erlware/relx.git",
- {tag, "v2.0.0"}}},
+ {branch, "master"}}},
{mustache, ".*",
{git, "https://github.com/soranoba/mustache.git",
{tag, "v0.3.0"}}},
diff --git a/rebar.lock b/rebar.lock
index 6bff315..b2783d2 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,6 +1,6 @@
[{<<"relx">>,
{git,"https://github.com/erlware/relx.git",
- {ref,"2e59b1c95575b3c104cc191e954c82baadc43c6c"}},
+ {ref,"74fec3455ba6dbb7d9e369137c1b15ab10804993"}},
0},
{<<"providers">>,
{git,"https://github.com/tsloughter/providers.git",