Merge remote-tracking branch 'bitcoin.org/master' into generatingtxes

Conflicts:
	_includes/references.md
This commit is contained in:
David A. Harding 2014-06-09 14:04:23 -04:00
commit ba1a33e712
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
25 changed files with 928 additions and 94 deletions

View file

@ -977,10 +977,11 @@ table td,table th{
font-size:80%;
}
.contributors span{
padding:6px 0;
padding:8px 0;
width:170px;
overflow:hidden;
display:inline-block;
vertical-align:top;
}
.resources{