diff options
author | Mission Liao <mission.liao@dexon.org> | 2018-12-25 10:06:35 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2018-12-28 14:15:39 +0800 |
commit | 245e0179da9d74cb71a0d9d67b0a9b41a3a6b6bd (patch) | |
tree | 7d6d19dd3701f575f7def58738aa127c6d476f33 /.mailmap | |
parent | 865f8d9baec2c2e4a330121976a2d330c877f19c (diff) | |
download | dexon-245e0179da9d74cb71a0d9d67b0a9b41a3a6b6bd.tar dexon-245e0179da9d74cb71a0d9d67b0a9b41a3a6b6bd.tar.gz dexon-245e0179da9d74cb71a0d9d67b0a9b41a3a6b6bd.tar.bz2 dexon-245e0179da9d74cb71a0d9d67b0a9b41a3a6b6bd.tar.lz dexon-245e0179da9d74cb71a0d9d67b0a9b41a3a6b6bd.tar.xz dexon-245e0179da9d74cb71a0d9d67b0a9b41a3a6b6bd.tar.zst dexon-245e0179da9d74cb71a0d9d67b0a9b41a3a6b6bd.zip |
vendor: sync DEXON core and fix conflicts/missings (#101)
Merging these commits in DEXON consensus core:
- https://github.com/dexon-foundation/dexon-consensus/commit/dce509a13ef5873b9cae3c1cabdb97e219b6fb7d
- https://github.com/dexon-foundation/dexon-consensus/commit/6d1c1aeea0d3e75d10cbb2712c68b4c422ba8ba6
- https://github.com/dexon-foundation/dexon-consensus/commit/c1ed57c4abaf1f4758e52f082bb7114ad00c8b39
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions