Commits · 5ffab25594a2346ed5bf4147c0eef5599078e924 · wallet / token

25 Nov, 2019 8 commits
- sovle confilct · 5ffab255
  shajiaiming authored Nov 25, 2019
  
  5ffab255
- fix · edd1d8d6
  shajiaiming authored Nov 25, 2019
  
  edd1d8d6
- Merge branch 'master' into feature/issue_coin · 60312f92
  shajiaiming authored Nov 25, 2019
  
  60312f92
- Merge branch 'feature/banner' into 'master' · 55c7d3ff
  shajiaiming authored Nov 25, 2019
```
Feature/banner

See merge request !214
```
  55c7d3ff
- fix · 597a0c79
  shajiaiming authored Nov 25, 2019
  
  597a0c79
- Merge branch 'master' into feature/issue_coin · 2e16fe95
  shajiaiming authored Nov 25, 2019
  
  2e16fe95
- Merge branch 'feature/optimize' into develop · 8bcbe042
  shajiaiming authored Nov 25, 2019
  
  8bcbe042
- fxi · f6ae9cf5
  shajiaiming authored Nov 25, 2019
  
  f6ae9cf5
22 Nov, 2019 13 commits
- Merge branch 'feature/optimize' into develop · 37d95d44
  shajiaiming authored Nov 22, 2019
  
  37d95d44
- fix · 2a5dfba3
  shajiaiming authored Nov 22, 2019
  
  2a5dfba3
- Merge branch 'feature/optimize' into develop · db3081fc
  shajiaiming authored Nov 22, 2019
  
  db3081fc
- fix · 038e8419
  shajiaiming authored Nov 22, 2019
  
  038e8419
- Merge branch 'feature/optimize' into develop · 087365a6
  shajiaiming authored Nov 22, 2019
  
  087365a6
- fix · 4a48da50
  shajiaiming authored Nov 22, 2019
  
  4a48da50
- Merge branch 'master' into feature/optimize · fd90b085
  shajiaiming authored Nov 22, 2019
  
  fd90b085
- fix · a94b5d9d
  shajiaiming authored Nov 22, 2019
  
  a94b5d9d
- fux · eaf8a7c8
  shajiaiming authored Nov 22, 2019
  
  eaf8a7c8
- Merge branch 'feature/banner' into develop · 7e03834f
  shajiaiming authored Nov 22, 2019
  
  7e03834f
- fix · 665ef435
  shajiaiming authored Nov 22, 2019
  
  665ef435
- Merge branch 'feature/banner' into develop · 4bc98917
  shajiaiming authored Nov 22, 2019
  
  4bc98917
- banner管理 · 38dcba0f
  shajiaiming authored Nov 22, 2019
  
  38dcba0f
21 Nov, 2019 13 commits
- Merge branch 'master' into develop · f41ccccf
  shajiaiming authored Nov 21, 2019
  
  f41ccccf
- Merge branch 'feature/explore' into 'master' · 2a67a230
  shajiaiming authored Nov 21, 2019
```
fix

See merge request !213
```
  2a67a230
- fix · 52b7dd64
  shajiaiming authored Nov 21, 2019
  
  52b7dd64
- Merge branch 'feature/optimize' into develop · 716c1805
  shajiaiming authored Nov 21, 2019
  
  716c1805
- fxi · 5ca5b9b3
  shajiaiming authored Nov 21, 2019
  
  5ca5b9b3
- Merge branch 'feature/optimize' into develop · 49b6ab6f
  shajiaiming authored Nov 21, 2019
  
  49b6ab6f
- 多语言配置化 · ae06a161
  shajiaiming authored Nov 21, 2019
  
  ae06a161
- Merge branch 'feature/issue_coin' into develop · a2297b1e
  shajiaiming authored Nov 21, 2019
  
  a2297b1e
- 交易组查询 · fc7cfdda
  shajiaiming authored Nov 21, 2019
  
  fc7cfdda
- Merge branch 'feature/platform_currency' into develop · a05a61db
  shajiaiming authored Nov 21, 2019
  
  a05a61db
- fix · 1d717ea8
  shajiaiming authored Nov 21, 2019
  
  1d717ea8
- Merge branch 'feature/platform_currency' into develop · 3fdb777f
  shajiaiming authored Nov 21, 2019
  
  3fdb777f
- 计价货币 · 9a9a1dc7
  shajiaiming authored Nov 21, 2019
  
  9a9a1dc7
20 Nov, 2019 6 commits
- 计价货币 · f693ddea
  shajiaiming authored Nov 20, 2019
  
  f693ddea
- Merge branch 'feature/ticker' into 'master' · 485ab183
  shajiaiming authored Nov 20, 2019
```
fix

See merge request !212
```
  485ab183
- fix · 47b7d68a
  shajiaiming authored Nov 20, 2019
  
  47b7d68a
- Merge branch 'feature/issue_coin' into 'master' · 25e7f88e
  shajiaiming authored Nov 20, 2019
```
fix

See merge request !211
```
  25e7f88e
- fix · 51015840
  shajiaiming authored Nov 20, 2019
  
  51015840
- Merge branch 'feature/explore' into 'master' · 5f91bd8d
  shajiaiming authored Nov 20, 2019
```
fix

See merge request !210
```
  5f91bd8d