diff options
author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-03-12 12:23:16 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 13:50:03 +0800 |
commit | ce768c70bafe1d320244835d487ea11fecd12b03 (patch) | |
tree | b576150470c9a3e88bb789ab31446e94cc1b5195 /.mailmap | |
parent | 6e31b6a13a0a24bb6c2b6d0fd71e4c2f023a16a5 (diff) | |
download | dexon-ce768c70bafe1d320244835d487ea11fecd12b03.tar dexon-ce768c70bafe1d320244835d487ea11fecd12b03.tar.gz dexon-ce768c70bafe1d320244835d487ea11fecd12b03.tar.bz2 dexon-ce768c70bafe1d320244835d487ea11fecd12b03.tar.lz dexon-ce768c70bafe1d320244835d487ea11fecd12b03.tar.xz dexon-ce768c70bafe1d320244835d487ea11fecd12b03.tar.zst dexon-ce768c70bafe1d320244835d487ea11fecd12b03.zip |
vendor: sync to latest core and fix conflict
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions