Commits · 4e8a95dd5d42e68c1dd13d397f5dc7ae74246586 · wallet / token

04 Dec, 2019 7 commits
- 解决冲突 · 4e8a95dd
  shajiaiming authored Dec 04, 2019
  
  4e8a95dd
- Merge branch 'feature/optimize' into 'master' · 2b31f7c5
  shajiaiming authored Dec 04, 2019
```
Feature/optimize

See merge request !233
```
  2b31f7c5
- fix · cdca8abd
  shajiaiming authored Dec 04, 2019
  
  cdca8abd
- Merge branch 'master' into feature/optimize · d1cfb63f
  shajiaiming authored Dec 04, 2019
  
  d1cfb63f
- Merge branch 'feature/c2c' into 'master' · 74c5abaa
  shajiaiming authored Dec 04, 2019
```
Feature/c2c

See merge request !232
```
  74c5abaa
- fix · 5ce0f792
  shajiaiming authored Dec 04, 2019
  
  5ce0f792
- Merge branch 'master' into develop · 2b001e76
  shajiaiming authored Dec 04, 2019
  
  2b001e76
03 Dec, 2019 16 commits
- Merge branch 'feature/issue_coin' into 'master' · edc2bb2e
  shajiaiming authored Dec 03, 2019
```
Feature/issue coin

See merge request !231
```
  edc2bb2e
- Merge branch 'master' into feature/issue_coin · 6fa58ebc
  shajiaiming authored Dec 03, 2019
  
  6fa58ebc
- Merge branch 'feature/optimize' into develop · faf69e8e
  shajiaiming authored Dec 03, 2019
  
  faf69e8e
- fix · 283d4301
  shajiaiming authored Dec 03, 2019
  
  283d4301
- Merge branch 'feature/optimize' into develop · b123659e
  shajiaiming authored Dec 03, 2019
  
  b123659e
- 置顶公告 · 15cd33ce
  shajiaiming authored Dec 03, 2019
  
  15cd33ce
- Merge branch 'master' into feature/optimize · 00d91e80
  shajiaiming authored Dec 03, 2019
  
  00d91e80
- Merge branch 'feature/ticker' into 'master' · 22dd39ab
  shajiaiming authored Dec 03, 2019
```
ghp price

See merge request !230
```
  22dd39ab
- ghp price · 10f6cfe5
  shajiaiming authored Dec 03, 2019
  
  10f6cfe5
- Merge branch 'feature/optimize' into develop · 918314fe
  shajiaiming authored Dec 03, 2019
  
  918314fe
- fix · 1bcd233e
  shajiaiming authored Dec 03, 2019
  
  1bcd233e
- fix · 6b4dc647
  shajiaiming authored Dec 03, 2019
  
  6b4dc647
- Merge branch 'feature/optimize' into develop · ba54a4d9
  shajiaiming authored Dec 03, 2019
  
  ba54a4d9
- Merge branch 'feature/issue_coin' into develop · e782e753
  shajiaiming authored Dec 03, 2019
  
  e782e753
- fix · 95cdf6ea
  shajiaiming authored Dec 03, 2019
  
  95cdf6ea
- fix · 22c32f4e
  shajiaiming authored Dec 03, 2019
  
  22c32f4e
02 Dec, 2019 17 commits
- Merge branch 'feature/optimize' into develop · 224abd88
  shajiaiming authored Dec 02, 2019
  
  224abd88
- 公告 · 4e222832
  shajiaiming authored Dec 02, 2019
  
  4e222832
- Merge branch 'feature/optimize' into develop · fbbd5525
  shajiaiming authored Dec 02, 2019
  
  fbbd5525
- fi · 907b6142
  shajiaiming authored Dec 02, 2019
  
  907b6142
- Merge branch 'feature/issue_coin' into develop · 1bdabc9a
  shajiaiming authored Dec 02, 2019
  
  1bdabc9a
- fix · 990497f2
  shajiaiming authored Dec 02, 2019
  
  990497f2
- fix · b15e5f1e
  shajiaiming authored Dec 02, 2019
  
  b15e5f1e
- Merge branch 'feature/optimize' into develop · 72050077
  shajiaiming authored Dec 02, 2019
  
  72050077
- fix · f8efab9a
  shajiaiming authored Dec 02, 2019
  
  f8efab9a
- Merge branch 'feature/issue_coin' into develop · 14b57681
  shajiaiming authored Dec 02, 2019
  
  14b57681
- fix · 28c846cc
  shajiaiming authored Dec 02, 2019
  
  28c846cc
- Merge branch 'feature/platform_currency' into develop · ddd67795
  shajiaiming authored Dec 02, 2019
  
  ddd67795
- Merge branch 'feature/platform_currency' into 'master' · 9ddbde28
  shajiaiming authored Dec 02, 2019
```
fix

See merge request !229
```
  9ddbde28
- fix · 68b06e20
  shajiaiming authored Dec 02, 2019
  
  68b06e20
- Merge branch 'master' into feature/optimize · 41d0099a
  shajiaiming authored Dec 02, 2019
  
  41d0099a
- Merge branch 'feature/platform_currency' into 'master' · f6fd63ce
  shajiaiming authored Dec 02, 2019
```
Feature/platform currency

See merge request !228
```
  f6fd63ce
- Merge branch 'feature/platform_currency' into develop · 9581dd2e
  shajiaiming authored Dec 02, 2019
  
  9581dd2e