CalDescent 4ac3984b7c Merge branch 'master' into sync-multiple-blocks ...

# Conflicts:
#	src/main/java/org/qortal/settings/Settings.java

2021-05-10 09:09:41 +01:00

..

java/org

Merge branch 'master' into sync-multiple-blocks

2021-05-10 09:09:41 +01:00

resources

Set go-live timestamp for same-length chain weight consensus: 1620579600000

2021-05-05 18:40:07 +01:00

wasm/memory-pow

Fix incorrect PoW buffer length usage

2020-06-08 09:01:55 +01:00

.DS_Store

Initial translations of UI terms into Finnish

2021-02-12 17:02:31 +02:00