Skip to content

Commit

Permalink
Merge pull request #171 from chef/dp_tales_from_the_encrypt
Browse files Browse the repository at this point in the history
Merged change 35832acd-e8fe-4656-ba15-7b8398183ae4

From review branch dp_tales_from_the_encrypt into master

Signed-off-by: reset <reset@chef.io>
  • Loading branch information
chef-delivery committed Jan 28, 2016
2 parents ce3a1d0 + 6d32f35 commit 4e829b3
Show file tree
Hide file tree
Showing 12 changed files with 1,302 additions and 197 deletions.
29 changes: 29 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ uuid = "*"
utp = "*"
rmp = "*"
rmp-serialize = "*"
rpassword = "*"

[dependencies.wonder]
path = "./vendor/wonder"
Expand Down
Loading

0 comments on commit 4e829b3

Please sign in to comment.