# This is a combination of 2 commits.
# The first commit's message is:

Merge pull request #454 from jorisbontje/423-dockerfile

update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423

Cleaned up jsonrpc test

# This is the 2nd commit message:

Forgot the #if
Merge pull request #454 from jorisbontje/423-dockerfile

update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423

Cleaned up jsonrpc test

Forgot the #if

Undo jsonrpc test changes
bugfix jumps after push
Merge pull request #468 from CJentzsch/bugfix

bugfix jumps after push