Merge branch 'master' into release-v0.2.1.0 #39

Merged
wowario merged 3 commits from release-v0.2.1.0 into release-v0.2.1.0 6 years ago

3 Commits (master)

Author SHA1 Message Date
wowario b8636dd448
Merge branch 'master' into release-v0.2.1.0
6 years ago
jw 1f6760533f
Merge pull request #27 from wowario/median_timestamp
6 years ago
Thaer Khawaja 4a479d2fcc
Use median timestamp if current time renders a block invalid.
6 years ago