Commit Graph

2 Commits

Author SHA1 Message Date
jl777
e73b2055c6 Merge branch 'beta' into mergemaster
# Conflicts:
#	src/main.cpp
2018-04-16 10:16:01 +03:00
Simon
2d931e905b Fixes #1823. Witness anchors for input notes no longer cross block boundaries. 2016-12-03 00:22:42 -08:00