Commit 76697564 authored by Michael Vandeberg's avatar Michael Vandeberg
Browse files

Merge branch '465-auth-validate' into 20160928-chain-refactor

# Conflicts:
#	libraries/app/database_api.cpp
#	libraries/chain/database.cpp
#	libraries/plugins/follow/follow_evaluators.cpp
#	libraries/protocol/include/steemit/protocol/config.hpp
#	libraries/protocol/include/steemit/protocol/steem_operations.hpp
parents 5a4e424d 37a6eb50
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment