Merge branch 'master' into develop
testnet versions check regression
filled status
filled except for BTC
recredit when filling
filled status for bets
use tx_hash in updates
fixed get_order_matches assertion error
filtered negative order fees
Merge branch 'develop' of https://github.com/PhantomPhreak/counterpartyd into develop
modify get_order_matches
conservation of assets
careful option; improved conservation check
Merge branch 'develop' of https://github.com/PhantomPhreak/counterpartyd into develop
conservation check not only at end of blocks
enabled mainnet fractions, dividends on escrowed funds; version bump
improved bet fee calculation; unified cancel offer code
callbacks cancel escrows; disabled callbacks on mainnet
version bump
Merge branch 'develop'