Merge commit '5fa123b6d7b64638fd1e93c9530479ed04d56950' into bitshares

Browse source

This commit merges the Graphene database version bump commit into BitShares (and overrides it with the BitShares version's bump).

Conflicts:
	libraries/chain/include/graphene/chain/config.hpp

...

This commit is contained in:

theoreticalbts 2015-12-09 18:19:43 -05:00

parent f699240e0a 5fa123b6d7

commit e6f8ef1679

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available