Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'riak-dt' of github.com:basho/riak into riak-dt

Conflicts:
	rebar.config
  • Loading branch information...
commit 387a12a5e31ed10da3f0f8d5dee16feb88b73242 2 parents 73b6df1 + 216c143
@russelldb russelldb authored
Showing with 1 addition and 0 deletions.
  1. +1 −0  rebar.config
View
1  rebar.config
@@ -18,3 +18,4 @@
{riaknostic, ".*", {git, "git://github.com/basho/riaknostic", {branch, "master"}}},
{riak_dt, ".*", {git, "git://github.com/basho/riak_dt", {branch, "master"}}}
]}.
+
Please sign in to comment.
Something went wrong with that request. Please try again.