CalDescent f36e193650 Merge branch 'master' into pirate-chain ... # Conflicts: # src/main/java/org/qortal/settings/Settings.java		2022-05-07 16:50:32 +01:00
..
java/org/qortal/test	Merge branch 'master' into pirate-chain	2022-05-07 16:50:32 +01:00
resources	Adapted Blockchain.java to use lookup table for name registration fees, to more easily support fee adjustments.	2022-04-16 12:20:03 +01:00