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

@ -224,7 +224,7 @@ body{
display:inline;
}
.eventtable div div{
.listtable div div{
zoom:1;
display:inline;
}

View file

@ -184,6 +184,12 @@ h2 .rssicon{
border-right:1px solid #e0e0e0;
margin-right:-1px
}
.start div div div a,
.start div div div a:link,
.start div div div a:active,
.start div div div a:visited{
padding:0 8px;
}
.foundation-banner a,
.foundation-banner a:link,

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{