2 Commits

Author SHA1 Message Date
Mike Hearn
b8a50a65cf Merge branch 'finish-timestamping'
# Conflicts:
#	docs/build/html/searchindex.js
#	src/core/serialization/Kryo.kt
2015-11-30 16:35:10 +00:00
jamescarlyle
4e933f6d51 Added basic Crowdfunding contract. 2015-11-27 23:55:47 +00:00