Commits · f0c1d0c17ff35a699eca2afd75b1998dbee65cb1 · xiaoye / mycard

08 Dec, 2016 8 commits
- 修复聊天室用户名undefined问题 · f0c1d0c1
  神楽坂玲奈 authored Dec 08, 2016
  
  f0c1d0c1
- dev20 · ff7bf7d1
  神楽坂玲奈 authored Dec 08, 2016
  
  ff7bf7d1
- 游戏更新 · ba66b5ec
  wudizhanche1000 authored Dec 08, 2016
  
  ba66b5ec
- ygopro国际化 · a769d444
  神楽坂玲奈 authored Dec 08, 2016
  
  a769d444
- ygopro国际化 · d643a2ad
  神楽坂玲奈 authored Dec 08, 2016
  
  d643a2ad
- 移除ygopro国际化 · 3436eb1f
  神楽坂玲奈 authored Dec 08, 2016
  
  3436eb1f
- 语言包优化 · bcae0ce9
  神楽坂玲奈 authored Dec 08, 2016
  
  bcae0ce9
- bundle · fa26571c
  神楽坂玲奈 authored Dec 08, 2016
  
  fa26571c
07 Dec, 2016 21 commits
- dev19 · 3d65af05
  神楽坂玲奈 authored Dec 07, 2016
  
  3d65af05
- tray · 9e93ed3f
  神楽坂玲奈 authored Dec 07, 2016
  
  9e93ed3f
- tray · 00af611c
  神楽坂玲奈 authored Dec 07, 2016
  
  00af611c
- dev18 · 354a62f4
  神楽坂玲奈 authored Dec 07, 2016
  
  354a62f4
- tray · 769d7164
  神楽坂玲奈 authored Dec 07, 2016
  
  769d7164
- fix · 8b56b547
  神楽坂玲奈 authored Dec 07, 2016
  
  8b56b547
- Merge branch 'v3' of github.com:mycard/mycard into v3 · 0b335a3a
  神楽坂玲奈 authored Dec 07, 2016
  
  0b335a3a
- fix · e676ab65
  神楽坂玲奈 authored Dec 07, 2016
  
  e676ab65
- Merge index.js · 9b3f8f5d
  wudizhanche1000 authored Dec 07, 2016
  
  9b3f8f5d
- Merge remote-tracking branch 'origin/v3' into v3 · 95f65352
  wudizhanche1000 authored Dec 07, 2016
```
# Conflicts:
#	app/apps.service.ts
#	index.js
```
  95f65352
- 修改 TODO内容 · 05e831bd
  wudizhanche1000 authored Dec 07, 2016
  
  05e831bd
- migrate · 783a2327
  神楽坂玲奈 authored Dec 07, 2016
  
  783a2327
- migrate · f9aa7628
  神楽坂玲奈 authored Dec 07, 2016
  
  f9aa7628
- migrate · 860cbfb7
  神楽坂玲奈 authored Dec 07, 2016
  
  860cbfb7
- migrate · 30febea8
  神楽坂玲奈 authored Dec 07, 2016
  
  30febea8
- auto update · 720fb8f4
  神楽坂玲奈 authored Dec 07, 2016
  
  720fb8f4
- fix auto update · 489e5cf2
  神楽坂玲奈 authored Dec 07, 2016
  
  489e5cf2
- fix, dev15 · 454228bc
  神楽坂玲奈 authored Dec 07, 2016
  
  454228bc
- ygopro i18n · aa081edb
  神楽坂玲奈 authored Dec 07, 2016
  
  aa081edb
- 浏览本地文件到下级 · 09e7a347
  神楽坂玲奈 authored Dec 07, 2016
  
  09e7a347
- 调整一些方法 · a833af7d
  wudizhanche1000 authored Dec 07, 2016
  
  a833af7d
06 Dec, 2016 11 commits
- Merge branch 'v3' of github.com:mycard/mycard into v3 · f1850581
  神楽坂玲奈 authored Dec 06, 2016
  
  f1850581
- apps service 一些改动，未测试 · 214b912b
  神楽坂玲奈 authored Dec 06, 2016
  
  214b912b
- Merge branch 'v3' of https://github.com/mycard/mycard into v3 · 6d014ac2
  wudizhanche1000 authored Dec 06, 2016
  
  6d014ac2
- 合并前提交 · 13aee426
  wudizhanche1000 authored Dec 06, 2016
  
  13aee426
- Tray · b59a8bbc
  wudizhanche1000 authored Dec 06, 2016
  
  b59a8bbc
- pc98 font · b2bf569f
  神楽坂玲奈 authored Dec 06, 2016
  
  b2bf569f
- Merge branch 'v3' of github.com:mycard/mycard into v3 · 530358c9
  神楽坂玲奈 authored Dec 06, 2016
  
  530358c9
- Tray · 6dacbd23
  神楽坂玲奈 authored Dec 06, 2016
  
  6dacbd23
- 合并InstallService和AppService · da3a1104
  wudizhanche1000 authored Dec 06, 2016
  
  da3a1104
- Merge branch 'v3' of github.com:mycard/mycard into v3 · 0759508b
  神楽坂玲奈 authored Dec 06, 2016
  
  0759508b
- tray · 4b0bf09a
  神楽坂玲奈 authored Dec 06, 2016
  
  4b0bf09a