diff options
author | Fabio Berger <me@fabioberger.com> | 2017-11-12 00:14:09 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-11-12 00:14:09 +0800 |
commit | c6f97f20fb7ada5135350c9120bfe203f78c0970 (patch) | |
tree | 9028936fd1ad8acb56625e0b4c633a88c18a5212 /circle.yml | |
parent | b66600338e0057baa6964328bdf337a905aa5ff9 (diff) | |
parent | 76b66872d8f797ee3b0efe0fa2ca914cf44ee46c (diff) | |
download | dexon-0x-contracts-c6f97f20fb7ada5135350c9120bfe203f78c0970.tar.gz dexon-0x-contracts-c6f97f20fb7ada5135350c9120bfe203f78c0970.tar.zst dexon-0x-contracts-c6f97f20fb7ada5135350c9120bfe203f78c0970.zip |
Merge branch 'development' into orderWatcher
* development:
0.22.6
Add new changes to CHANGELOG
use util fn
no race, reject from interval cb and clear
allow timeout for await transaction mined
# Conflicts:
# src/types.ts
Diffstat (limited to 'circle.yml')
0 files changed, 0 insertions, 0 deletions