Commits · 2a74f068bb39a2a9f613c3ca66ed9ad37b804567 · ops / luna

08 Jan, 2018 18 commits
- Merge branch 'master' into test · 2a74f068
  liuzheng712 authored Jan 08, 2018
  
  2a74f068
- Merge branch 'dev' into test · 9c699463
  liuzheng712 authored Jan 08, 2018
  
  9c699463
- feat: font · cc3925b2
  liuzheng712 authored Jan 08, 2018
  
  cc3925b2
- Merge branch 'master' of bitbucket.org:jumpserver/luna · 1072ed9d
  liuzheng712 authored Jan 08, 2018
  
  1072ed9d
- Merge branch 'dev' · 457fa239
  liuzheng712 authored Jan 08, 2018
  
  457fa239
- feat: update · 93b629f0
  liuzheng712 authored Jan 08, 2018
  
  93b629f0
- feat: color · de15d27d
  liuzheng712 authored Jan 08, 2018
  
  de15d27d
- Merged in dev (pull request #25) · 39912e0c
  zheng liu authored Jan 08, 2018
```
fix: delete the google fonts!!!
```
  39912e0c
- fix: delete the google fonts!!! · 5e4f0e47
  liuzheng712 authored Jan 08, 2018
  
  5e4f0e47
- Merged in test (pull request #24) · 7dcb7d32
  zheng liu authored Jan 08, 2018
```
fix: google fonts
```
  7dcb7d32
- Merged in dev (pull request #23) · d3cb071f
  zheng liu authored Jan 08, 2018
```
fix: google fonts
```
  d3cb071f
- fix: google fonts · a24f7d4e
  liuzheng712 authored Jan 08, 2018
  
  a24f7d4e
- Merged in test (pull request #22) · 11192fb6
  zheng liu authored Jan 08, 2018
```
Test
Approved-by: zheng liu <liuzheng712@gmail.com>
```
  11192fb6
- Merged in dev (pull request #21) · fda76726
  zheng liu authored Jan 08, 2018
```
feat:
Approved-by: zheng liu <liuzheng712@gmail.com>
```
  fda76726
- Merged in deploy (pull request #20) · 6cf745d2
  zheng liu authored Jan 08, 2018
```
Deploy
```
  6cf745d2
- feat: udpate · 53b18740
  liuzheng712 authored Jan 08, 2018
  
  53b18740
- feat: · 799215c0
  liuzheng712 authored Jan 08, 2018
  
  799215c0
- feat: version · d9c06d57
  liuzheng712 authored Jan 08, 2018
  
  d9c06d57
04 Jan, 2018 4 commits
- Merged in dev (pull request #19) · 6060fd1c
  zheng liu authored Jan 04, 2018
```
feat: update favicon.ico
```
  6060fd1c
- feat: update favicon.ico · 3b6744e8
  liuzheng authored Jan 04, 2018
  
  3b6744e8
- Merged in dev (pull request #18) · 47e4af1e
  zheng liu authored Jan 04, 2018
```
Dev
```
  47e4af1e
- fix: google fonts add · 4c348f78
  liuzheng authored Jan 04, 2018
  
  4c348f78
03 Jan, 2018 3 commits
- feat: update · 3c9fa1d7
  liuzheng authored Jan 03, 2018
  
  3c9fa1d7
- fix: update · 264e7589
  liuzheng authored Jan 03, 2018
  
  264e7589
- Merged in dev (pull request #17) · de3bed0e
  zheng liu authored Jan 03, 2018
```
feat: update
```
  de3bed0e
02 Jan, 2018 15 commits
- feat: update · 36dd06e6
  liuzheng authored Jan 02, 2018
  
  36dd06e6
- Merged in test (pull request #16) · 2e1c4ca0
  zheng liu authored Jan 02, 2018
```
Test
Approved-by: zheng liu <liuzheng712@gmail.com>
```
  2e1c4ca0
- feat: udpate · 538dec5c
  liuzheng authored Jan 02, 2018
  
  538dec5c
- feat: update · 9cbd0b43
  liuzheng authored Jan 02, 2018
  
  9cbd0b43
- Merged in deploy (pull request #14) · 87a8e3cc
  zheng liu authored Jan 02, 2018
```
feat: update
Approved-by: zheng liu <liuzheng712@gmail.com>
```
  87a8e3cc
- feat: update · a56f82a5
  liuzheng authored Jan 02, 2018
  
  a56f82a5
- feat: update · 0a9135cb
  liuzheng authored Jan 02, 2018
  
  0a9135cb
- Merged in test (pull request #13) · 832d2dec
  zheng liu authored Jan 02, 2018
```
Test
Approved-by: zheng liu <liuzheng712@gmail.com>
```
  832d2dec
- Merge branch 'deploy' into test · aadd90b7
  liuzheng authored Jan 02, 2018
  
  aadd90b7
- fix: update · 2679af7d
  liuzheng authored Jan 02, 2018
  
  2679af7d
- Merge branch 'deploy' into test · dff37f93
  liuzheng authored Jan 02, 2018
  
  dff37f93
- feat: update · 3a7c2c12
  liuzheng authored Jan 02, 2018
  
  3a7c2c12
- Merge branch 'dev' into test · 5f1681bb
  liuzheng authored Jan 02, 2018
  
  5f1681bb
- feat: update · db17df36
  liuzheng authored Jan 02, 2018
  
  db17df36
- Merge branch 'deploy' into test · 943f7174
  liuzheng authored Jan 02, 2018
  
  943f7174