Commits · 40318e4c24f3ca0dcbd15043d096619cdee4225e · MyCard / Moecube Accounts Web

07 Apr, 2017 9 commits
- avatar · 40318e4c
  nano authored Apr 07, 2017
  
  40318e4c
- lint · e6c53dad
  nano authored Apr 07, 2017
  
  e6c53dad
- Merge remote-tracking branch 'origin/master' · 497759fa
  2breakegg authored Apr 07, 2017
```
# Conflicts:
#	src/models/common.js
#	src/routes/Index.js
#	src/routes/Register.js
```
  497759fa
- change language 按钮位置 · 4fdee9cc
  2breakegg authored Apr 07, 2017
  
  4fdee9cc
- env · f92bc055
  nano authored Apr 07, 2017
  
  f92bc055
- change language 按钮位置 · 323eb459
  2breakegg authored Apr 07, 2017
  
  323eb459
- fix aslant · 8409c374
  nano authored Apr 07, 2017
  
  8409c374
- Merge remote-tracking branch 'origin/master' · 3df1452a
  nano authored Apr 07, 2017
```
# Conflicts:
#	src/routes/Index.js
```
  3df1452a
- Merge remote-tracking branch 'origin/master' · d317d3ca
  nano authored Apr 07, 2017
```
# Conflicts:
#	src/routes/Index.js
```
  d317d3ca
06 Apr, 2017 31 commits
- i18n · 9f623290
  2breakegg authored Apr 06, 2017
  
  9f623290
- Merge branch 'master' of https://github.com/moecube/moecube-accounts-web · 9a49cee4
  2breakegg authored Apr 06, 2017
  
  9a49cee4
- change language · bb2c37c3
  2breakegg authored Apr 06, 2017
  
  bb2c37c3
- travis · f8dae8f3
  神楽坂玲奈 authored Apr 06, 2017
  
  f8dae8f3
- Merge remote-tracking branch 'origin/master' · 1a7177ed
  2breakegg authored Apr 06, 2017
  
  1a7177ed
- travis · 0373d4e2
  神楽坂玲奈 authored Apr 06, 2017
  
  0373d4e2
- change language · 8e8fb944
  2breakegg authored Apr 06, 2017
  
  8e8fb944
- travis · 7fa5e194
  神楽坂玲奈 authored Apr 06, 2017
  
  7fa5e194
- travis · e56e1de8
  神楽坂玲奈 authored Apr 06, 2017
  
  e56e1de8
- fix footer · db292f14
  nano authored Apr 06, 2017
  
  db292f14
- update · 65c02fb0
  nano authored Apr 06, 2017
  
  65c02fb0
- Merge remote-tracking branch 'origin/master' · 7ceb460f
  神楽坂玲奈 authored Apr 06, 2017
```
# Conflicts:
#	src/models/auth.js
#	src/routes/Index.js
```
  7ceb460f
- Merge remote-tracking branch 'origin/master' · fc3eb755
  神楽坂玲奈 authored Apr 06, 2017
```
# Conflicts:
#	src/models/auth.js
#	src/routes/Index.js
```
  fc3eb755
- Merge remote-tracking branch 'origin/master' · a27d9604
  神楽坂玲奈 authored Apr 06, 2017
```
# Conflicts:
#	src/models/auth.js
#	src/routes/Index.js
```
  a27d9604
- reformat code · 861e9909
  神楽坂玲奈 authored Apr 06, 2017
  
  861e9909
- log out · bcd4546f
  2breakegg authored Apr 06, 2017
  
  bcd4546f
- reformat code · ad3f621b
  2breakegg authored Apr 06, 2017
  
  ad3f621b
- Merge remote-tracking branch 'origin/master' · 0567886c
  2breakegg authored Apr 06, 2017
```
# Conflicts:
#	src/routes/Index.js
```
  0567886c
- reformat code · f6c98b2e
  2breakegg authored Apr 06, 2017
  
  f6c98b2e
- fix · 6802465c
  nano authored Apr 06, 2017
  
  6802465c
- Merge remote-tracking branch 'origin/master' · e32291a9
  2breakegg authored Apr 06, 2017
```
# Conflicts:
#	src/router.js
#	src/routes/Index.js
```
  e32291a9
- reformat code · d1e78c3d
  2breakegg authored Apr 06, 2017
  
  d1e78c3d
- fix footer · 751da7be
  nano authored Apr 06, 2017
  
  751da7be
- Merge branch 'master' of https://github.com/moecube/moecube-accounts-web · 26b58b53
  2breakegg authored Apr 06, 2017
  
  26b58b53
- cross-env · 7b231c98
  nano authored Apr 06, 2017
  
  7b231c98
- Merge branch 'master' of https://github.com/moecube/moecube-accounts-web · 1ce87723
  2breakegg authored Apr 06, 2017
  
  1ce87723
- error.messages · 5f0ec4b2
  2breakegg authored Apr 06, 2017
  
  5f0ec4b2
- Merge remote-tracking branch 'origin/master' · a76f2c3a
  nano authored Apr 06, 2017
```
# Conflicts:
#	src/models/user.js
```
  a76f2c3a
- Merge remote-tracking branch 'origin/master' · a96f7307
  2breakegg authored Apr 06, 2017
```
# Conflicts:
#	src/models/user.js
```
  a96f7307
- error.messages · a4d9fd27
  2breakegg authored Apr 06, 2017
  
  a4d9fd27
- public path · 2a6b213d
  nano authored Apr 06, 2017
  
  2a6b213d