Merge branch 'release' into develop

Browse Source

Conflicts:
	Builds/rpm/rippled.spec
	src/ripple/protocol/impl/BuildInfo.cpp

...

This commit is contained in:

Vinnie Falco

2015-07-15 16:56:10 -07:00

parent 77b3ad5de1 3b751cc6e6

commit 7ce871f3b2

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available