wsdjeg
1bb916cf90
Set sign text
2017-12-18 22:27:51 +08:00
wsdjeg
628551c4f2
Change gitk plugin
2017-12-17 09:35:22 -06:00
wsdjeg
861914d339
Add key bindings for list projects
2017-12-17 21:57:02 +08:00
wsdjeg
a5f349096f
Fix shell config
2017-12-17 20:36:58 +08:00
wsdjeg
a97504f04e
Update elixir layer
2017-12-16 20:50:31 +08:00
wsdjeg
077079ce13
Fix SPC f b for show bookmarks
2017-12-16 13:25:06 +08:00
wsdjeg
dfd556cef4
Fix statusline error
2017-12-15 22:47:50 +08:00
wsdjeg
ed3a3fceee
Add debug transient state
2017-12-14 21:58:22 +08:00
wsdjeg
814f833514
Add smart debugger lauching for ruby
2017-12-14 21:39:37 +08:00
wsdjeg
190274c4c1
Add debug layer
2017-12-14 21:30:20 +08:00
wsdjeg
5fa340dd79
Update statusline for VebuggerShell && VebuggerTerminal
2017-12-13 22:28:26 +08:00
wsdjeg
6f766a3eeb
Update key bindings for debug layer
2017-12-13 21:41:44 +08:00
wsdjeg
2bdf2e54da
Fix screen blink
2017-12-13 19:51:35 +08:00
Wang Shidong
4e34b8f9f7
Merge pull request #1114 from icearith/fix_move_line
...
reimplement move text down and up
2017-12-13 18:53:10 +08:00
Arith Xu
70e166f441
fix funny mistake
2017-12-13 18:46:30 +08:00
Arith Xu
591670a045
add noautocmd when moving lines up or down
2017-12-13 15:44:36 +08:00
Wang Shidong
aa633bd703
Merge pull request #1111 from sei40kr/feature/emmet-jsx-improve
...
Improve Emmet configuration
2017-12-12 23:16:26 +08:00
Arith Xu
269dd0940d
reimplement move text down and up, use native move command with force silent mode
2017-12-12 22:48:01 +08:00
wsdjeg
4604e4fb34
Fix unkownfunc in first installation
2017-12-12 16:08:43 +08:00
wsdjeg
4ec6a9d015
Add statusline for repl
2017-12-12 15:14:35 +08:00
wsdjeg
b19851d3d6
Update ruby layer
2017-12-12 15:05:41 +08:00
wsdjeg
7556c5caa9
Fix repl for ruby
2017-12-12 13:46:38 +08:00
wsdjeg
34ba04f184
Update lang#ruby layer
2017-12-12 13:12:34 +08:00
Seong Yong-ju
028c877c57
Improve Emmet configuration
...
* Use JSX Emmet presets for Javascript
2017-12-12 01:10:54 +09:00
wsdjeg
2be1e53b06
Add mappings for python REPL
2017-12-11 23:54:50 +08:00
wsdjeg
1c48fafbc4
Fix vim support
2017-12-11 23:14:03 +08:00
wsdjeg
a2c443e33a
Add repl Framework
2017-12-11 22:55:42 +08:00
wsdjeg
de5723b53b
Update doc for python layer
2017-12-11 20:51:17 +08:00
Wang Shidong
321f801e42
Merge pull request #1103 from sei40kr/feature/ale-fix
...
Fix an issue occurd in ALE-enabled environment
2017-12-10 19:27:59 +08:00
Wang Shidong
baba4f8896
Merge pull request #1099 from sei40kr/feature/vim-node
...
Add a new plugin for JavaScript
2017-12-10 19:25:16 +08:00
Seong Yong-ju
33b07e71a9
Improve implementations of tmux integration
...
* Toggle visibility of cursor line on entering/leaving tmux pane
* Load tmux plugins lazily for faster start-up
2017-12-10 15:02:29 +09:00
Seong Yong-ju
eb78653f09
Fix an issue occurd in ALE-enabled environment
...
* Disable caret move hooks unless using Neomake
* Minor fix for ALE plugin configurations
2017-12-10 14:12:14 +09:00
wsdjeg
7cde44ae0f
Check event CmdLineEnter
2017-12-10 00:23:18 +08:00
wsdjeg
557d14eb9c
Merge branch 'dev' into signatures
2017-12-09 22:18:41 +08:00
Seong Yong-ju
6a2a7d156c
Add a new plugin for JavaScript
...
* Add a new plugin `moll/vim-node`
* Minor refactoring
2017-12-09 23:16:07 +09:00
Seong Yong-ju
b0bfa429d0
Add language server configurations for Haskell
...
* Add language server commands for Haskell
* Update key mappings for Haskell
2017-12-09 18:18:21 +09:00
Seong Yong-ju
9c5fddeb98
Merge branch 'feature/js-lsp' into feature/haskell-lsp
2017-12-09 17:57:53 +09:00
Seong Yong-ju
7c8d803865
Improve layer implementations for lsp, javascript
2017-12-09 17:49:42 +09:00
Seong Yong-ju
df4101e8fd
Add language server configuration for JavaScript
...
* Add APIs for register server commands for LSP
* Add server command for JavaScript language server
* Add a new layer option `use_lsp` for layer `javascript`
* Update key mappings for Javascript
2017-12-09 17:34:18 +09:00
wsdjeg
c7fd4811fe
Change icon for git branch
2017-12-08 20:49:03 +08:00
wsdjeg
8ad33a19b8
Add chat config
2017-12-07 20:54:47 +08:00
wsdjeg
e07ad4d74a
Improve #1056
2017-12-06 18:15:55 +08:00
wsdjeg
a7d7831bd1
Fix 1056
2017-12-06 16:15:18 +08:00
wsdjeg
b36df096f5
Fix statusline for inactive window
2017-12-06 10:59:48 +08:00
wsdjeg
a12d2aae63
Fix statusline for inactive window
2017-12-06 10:53:21 +08:00
wsdjeg
d8774f488e
Fix inactive window statusline
2017-12-05 19:52:44 +08:00
wsdjeg
ce0308cdbd
Add support for check winwidth
2017-12-05 13:46:49 +08:00
wsdjeg
83568afc5f
Fix up
2017-12-05 10:17:43 +08:00
wsdjeg
54ec968bc9
Fix ycm mappings
2017-12-05 10:00:05 +08:00
wsdjeg
421f5a6053
check +tablineat support
2017-12-04 21:19:15 +08:00
wsdjeg
79b1940227
Update doc
2017-12-04 21:12:55 +08:00
wsdjeg
a366d0c91a
Add support for mouse click
2017-12-04 20:55:33 +08:00
wsdjeg
cae4fd9c00
Merge branch 'lang#c' into dev
2017-12-04 09:53:47 +08:00
wsdjeg
ca05f862e3
Fix tabline
2017-12-04 09:31:11 +08:00
wsdjeg
23e7f10560
Fix up
2017-12-04 09:23:58 +08:00
wsdjeg
e3f710158b
Use inactive highligt group
2017-12-04 09:08:45 +08:00
wsdjeg
fa88ae5497
Add modified checker
2017-12-04 08:40:57 +08:00
wsdjeg
19db671adb
Add highlight for modifid buffer
2017-12-04 07:54:03 +08:00
wsdjeg
cb3e340ec7
Add config for completor and clang2
2017-12-04 00:32:46 +08:00
wsdjeg
4a4b5e8fb6
Update lang#c layer
2017-12-03 23:21:00 +08:00
tracyone
8880cf355b
zsh:support autocomplete
...
1. autotrigger in YCM and deoplete.
2. press ^x^o in other case
2017-12-03 20:49:54 +08:00
wsdjeg
89b9b5bbbe
Merge branch 'hunk_summary' into dev
2017-12-03 14:45:39 +08:00
wsdjeg
e170ace6e3
Update statusline After updating a buffer's signs
2017-12-03 14:13:56 +08:00
wsdjeg
900196b69a
Fix conflict
2017-12-02 20:10:29 +08:00
wsdjeg
631a743bda
Fix mappings
2017-12-02 20:07:03 +08:00
wsdjeg
2437fd0b3a
Add mapping desc for SPC n +
2017-12-02 19:53:07 +08:00
wsdjeg
02797ac3a5
Add mapping desc for SPC n -
2017-12-02 19:36:56 +08:00
chenchong
84c745de71
bugfix start zsh error
2017-12-01 19:41:50 +08:00
wsdjeg
be6593be24
Add support for nerdtree
2017-12-01 16:17:32 +08:00
wsdjeg
e6c4ae5d02
Add hunks summary
2017-12-01 10:58:30 +08:00
wsdjeg
d81c440947
Fix statuslibe
2017-12-01 07:58:00 +08:00
wsdjeg
88f383e5de
Redraw screen without cmdline
2017-11-30 09:36:36 +08:00
wsdjeg
4e46f6c1a2
Update spacevim
2017-11-30 09:27:17 +08:00
Mayeul d'Avezac
19864bbfb8
Enable syntax error/warning counts in status line
2017-11-29 16:55:19 +00:00
wsdjeg
4be5048c02
Add number transient state
2017-11-30 00:49:36 +08:00
wsdjeg
a93d86ea22
Add mappings
2017-11-30 00:34:48 +08:00
Seong Yong-ju
bf037608a1
Fix Yggdroot/indentLine configuration
...
* Add filetype for man pages to indentLine exclusions.
2017-11-29 01:37:37 +09:00
wsdjeg
eed5c0a46e
Add signatures
2017-11-28 20:40:10 +08:00
wsdjeg
7db6faed6c
Update sig api
2017-11-28 10:39:47 +08:00
wsdjeg
8d1067c33c
Add battery status for macos && close #1008
2017-11-26 21:10:33 +08:00
wsdjeg
b5eaef25a0
Merge remote-tracking branch 'origin/fix_ycm' into dev
2017-11-24 23:08:55 +08:00
wsdjeg
e1eadf42cf
Add asyncomplete-omni
2017-11-24 00:05:54 +08:00
wsdjeg
c67f6a8c9f
Add buffer and neco
2017-11-23 23:57:13 +08:00
wsdjeg
851acc3c46
Add neosnippet support for completor
2017-11-23 10:50:01 +08:00
wsdjeg
b934a4b7b9
Add too completion plugins
2017-11-23 08:33:52 +08:00
wsdjeg
ec0193f480
Fix #1024 , lua layer do not support neovim
2017-11-22 20:06:53 +08:00
wsdjeg
62795727fd
Fix SPC p f mapping
2017-11-20 20:11:09 +08:00
Seong Yong-ju
dcdbc17593
Add a condition to load LSP plugin
...
* Add Python3 requirement to `LanguageClient-neovim`
2017-11-19 23:47:01 +09:00
Seong Yong-ju
4b4fddf4ae
Merge remote-tracking branch 'upstream/dev' into feature/lsp-layer
2017-11-19 23:38:24 +09:00
Seong Yong-ju
3e5a80723c
Add a new layer lsp
...
Add a new layer lsp
* Add a new layer lsp
* Move `LanguageClient-neovim` from autocomplete layer to lsp
* Add configurations for LSP syntax checking
2017-11-19 23:35:28 +09:00
wsdjeg
0fdee1fcca
Add custom func
2017-11-19 15:23:30 +08:00
wsdjeg
91f2968450
Fix battery status support
2017-11-19 14:55:43 +08:00
wsdjeg
89010ac7bb
Update statusline
2017-11-19 14:33:43 +08:00
wsdjeg
b3f42b34e8
Add SPC t m d for toggle date
2017-11-19 13:19:57 +08:00
wsdjeg
252203d393
Fix toggle sections
2017-11-19 13:04:48 +08:00
wsdjeg
840a0c75e5
Fix Percentage
2017-11-19 10:54:12 +08:00
wsdjeg
2b107721ac
Update sections
2017-11-19 10:18:32 +08:00
wsdjeg
da1843fd03
Enable fileformat icon
2017-11-19 09:29:34 +08:00
Matteo Bigoi
b87c235d18
Remove duplicated git log
2017-11-17 18:56:20 +00:00
Bigo
1905e6340e
Add mappings for git blame and git log
2017-11-17 14:26:09 +00:00
wsdjeg
7407f26981
Silent reset file
2017-11-17 21:51:09 +08:00
wsdjeg
e582ff1d90
Update git layer
2017-11-17 21:27:47 +08:00
wsdjeg
14c6beac93
Update git layer
2017-11-17 21:08:32 +08:00
wsdjeg
9d00ab95b3
Update git layer
2017-11-17 20:16:06 +08:00
wsdjeg
3a31907410
Fix SPC g M mappings
2017-11-17 16:31:16 +08:00
wsdjeg
cf615bcdd7
Update git layer
2017-11-17 16:20:13 +08:00
wsdjeg
b0f00cd74d
Update mappings
2017-11-17 15:46:56 +08:00
wsdjeg
63c49dfc22
Add cmd for stage/unstage files
2017-11-17 14:08:18 +08:00
wsdjeg
eeb451b798
Add VCS transient-state
2017-11-17 13:07:24 +08:00
Wang Shidong
afa246fba8
Merge pull request #1002 from sei40kr/feature/edit-jplus
...
Added a new plugin vim-jplus
2017-11-16 22:06:46 -06:00
Wang Shidong
b1d6c150e0
Merge pull request #1000 from sei40kr/feature/ale-statusline
...
Added autocmd to update status-line
2017-11-15 17:53:34 -06:00
Seong Yong-ju
7f96821e29
Added a new plugin vim-jplus
...
Added a new plugin vim-jplus to edit layer.
2017-11-15 23:35:17 +09:00
Seong Yong-ju
6436de88f4
Added autocmd to update status-line
...
Added autocmd to update status-line on ALE process completion.
2017-11-14 14:59:50 +09:00
wsdjeg
f2a8ef04d6
Add gd for help desc buffer && fix SPC p f
2017-11-14 00:42:53 +08:00
wsdjeg
d042550b05
Merge branch 'lsp' into dev
...
close #512
2017-11-13 20:18:44 +08:00
wsdjeg
0d3e27fb1d
Auto download vimproc.dll for windows
2017-11-13 16:36:45 +08:00
Huanming Peng
3b610359f0
Fixed plugin 'vim-rtags' initialization errors
...
Plugin 'lyuts/vim-rtags' has not supported python3 yet.
Issue Link [Python 3 support requirement](https://github.com/lyuts/vim-rtags/issues/86 ).
2017-11-13 14:09:42 +08:00
Wang Shidong
778b0a80ca
Merge pull request #991 from sei40kr/feature/js-improve
...
Added language features for JavaScript
2017-11-12 20:33:39 -06:00
Wang Shidong
8a0fcb36e7
Merge pull request #992 from sei40kr/feature/crystal-runner
...
Added a runner for Crystal language
2017-11-12 17:03:28 -06:00
wsdjeg
62d58977bf
Enable deoplete in vim8
2017-11-12 22:28:56 +08:00
wsdjeg
b90b27a161
Merge 'sei40kr/feature/ruby-runner' into dev
2017-11-12 20:21:09 +08:00
wsdjeg
cdacf845a1
Merge 'sei40kr/feature/zsh-lang'
2017-11-12 20:14:57 +08:00
Seong Yong-ju
1482cab567
Added plugin configuration
...
Added plugin configuration for chrisbra/vim-zsh.
2017-11-12 20:38:09 +09:00
Seong Yong-ju
df83680801
Added a runner for Ruby language
...
Added a runner for Ruby language.
2017-11-12 20:30:15 +09:00
Seong Yong-ju
0ef49fd4b6
Added a runner for Crystal language
...
Added a runner for Crystal language.
2017-11-12 20:18:23 +09:00
Seong Yong-ju
4ec5ab8d45
Added language features for JavaScript
...
Added language features for JavaScript. Import statement addition,
refactoring the variable under cursor, and so on.
2017-11-12 19:33:46 +09:00
Seong Yong-ju
c2765ac64b
Added zsh support
...
Added zsh support.
2017-11-12 17:48:15 +09:00
Seong Yong-ju
2481669c6e
Made Markdown preview use open-browser.vim
...
Made Markdown preview use open-browser.vim, which enables to use user's default
browser.
2017-11-12 09:29:33 +09:00
Wang Shidong
48ee7c2da6
Merge branch 'dev' into feature/rust-lang
2017-11-07 22:41:14 -06:00
Seong Yong-ju
fe5f02077a
Fixed Rust key bindings
...
Fixed an issue that Rust key bindings override global bindings.
2017-11-08 11:50:07 +09:00
Seong Yong-ju
d7431b6e50
Fixed Haskell layer config
...
Fixed an issue that Haskell layer overrides a function of C/C++ layer.
2017-11-08 11:45:35 +09:00
Seong Yong-ju
ba56e15cc7
Updated on documentation in source code
2017-11-07 23:02:20 +09:00
Seong Yong-ju
bba8a48dc6
Added Rust language features
...
* Runner command for Rust
* Language specified key-mappings
2017-11-07 22:41:40 +09:00
Seong Yong-ju
1d5be830db
Added runner for Haskell
...
Added GHC command as a runner for Haskell programming language.
2017-11-07 19:30:19 +09:00
wsdjeg
cfdcf759d8
Add installer for windows
2017-11-05 19:57:59 +08:00
wsdjeg
cdd53a9cf4
Add vim-fireplace
2017-11-05 19:20:53 +08:00
wsdjeg
0310d3e6bb
Add lint and formater
2017-11-05 19:09:55 +08:00
wsdjeg
603c842fd0
Add clojure-vim/async-clj-omni
2017-11-05 16:49:27 +08:00
wsdjeg
4a0b418f47
Add clojure layer
2017-11-05 16:34:53 +08:00
wsdjeg
ed142f7530
Fix multiple cursor
2017-11-05 13:44:33 +08:00
wsdjeg
24fce8f3d5
Add runner for c file
2017-11-04 20:16:22 +08:00
wsdjeg
3988bd67ed
Add lang#solidity layer
2017-11-03 21:42:34 +08:00
wsdjeg
519a7c6ea3
Close #940
2017-11-03 19:55:18 +08:00
wsdjeg
3ed990f398
Add completion for SPC !
...
close #953
2017-11-03 19:49:17 +08:00
wsdjeg
45f63183f5
Merge branch 'dev' of github.com:SpaceVim/SpaceVim into dev
2017-10-28 21:09:03 +08:00
wsdjeg
bfdf29387c
Fix #908
2017-10-28 21:07:38 +08:00
Wang Shidong
f1fcb70ac7
Merge pull request #936 from sei40kr/feature/ale-echo-msg
...
Fixed ALE setting issues
2017-10-28 21:00:33 +08:00
Wang Shidong
fe1d65d869
Merge pull request #934 from crisidev/dev
...
Add statusline errors / warnings report for ale
2017-10-28 21:00:13 +08:00
Wang Shidong
4ac9f99fb7
Merge branch 'dev' into quickfix
2017-10-28 15:14:20 +08:00
ssfdust
eb34a88eca
switch <c-u> to <c-m>
2017-10-28 14:20:59 +08:00
ssfdust
53b5dde20c
resolve conflicts between tmux layer and edit layer
2017-10-27 17:55:41 +08:00
wsdjeg
3f71a23c9e
Fix tabline
2017-10-27 00:14:44 +08:00
Seong Yong-ju
698d2bfeaf
Fixed ALE setting issues
...
* Fixed an issue that ALE settings get loaded after ALE initialization.
* Added linter info to error message by default.
2017-10-26 01:49:53 +09:00
Bigo
99bfdb4670
Add statusline errors / warnings report for ale
2017-10-25 16:28:20 +01:00
wsdjeg
62c3402687
Add mappings
2017-10-25 22:56:21 +08:00
wsdjeg
cd69cbf667
Fix Spc e L
2017-10-25 22:45:24 +08:00
wsdjeg
b10ac4ad4a
Update doc
2017-10-25 10:27:25 +08:00
wsdjeg
1ab709de30
Merge clear_errors branch
2017-10-25 10:09:43 +08:00
wsdjeg
0a6fb1b9a1
Add ale
2017-10-25 09:41:04 +08:00
Daniel Hahler
799317cc2f
WIP: improve Neomake integration
...
Ref: https://github.com/SpaceVim/SpaceVim/issues/200
2017-10-24 19:09:54 +02:00
wsdjeg
7910b14e84
Fix shell layer
2017-10-23 21:02:54 +08:00
Wang Shidong
36631dad3c
Merge branch 'dev' into optional_custom_palette
2017-10-23 05:46:32 -05:00
Adrien Bouttier
9baf2f0154
Add custom palette
2017-10-23 10:37:17 +02:00
wsdjeg
dd4d6d2f68
Fix lint
2017-10-23 13:00:38 +08:00
Wang Shidong
e6ff621e90
Merge branch 'dev' into vim_mail
2017-10-22 23:54:09 -05:00
Seong Yong-ju
2293463b96
Merge branch 'dev' into feature/vim-jp-doc
2017-10-23 01:39:29 +09:00
Seong Yong-ju
f7a2f3e462
Added a new layer, japanese
...
Added a new layer japanese which loads vim-jp/vimdoc-ja.
2017-10-23 00:25:51 +09:00
Wang Shidong
d4474199ee
Merge branch 'dev' into feature/haskell-setup
2017-10-22 10:18:13 -05:00
Wang Shidong
9d15acdbf0
Merge branch 'dev' into feature/echodoc
2017-10-22 10:11:00 -05:00
Wang Shidong
5e6eaa2183
Merge branch 'dev' into feature/haskell-setup
2017-10-22 10:10:43 -05:00
Seong Yong-ju
333fe529cb
Added auto-completion settings for Haskell
...
Added auto-completion settings for Haskell to use eagletmt/neco-ghc.
2017-10-22 23:51:32 +09:00
Seong Yong-ju
b18f24a8a3
Added Shougo/echodoc.vim to autocomplete layer
...
Added a new plugin Shougo/echodoc.vim to autocomplete layer.
2017-10-22 23:15:01 +09:00
wsdjeg
c903b776a3
Update SPC e c command
2017-10-22 20:49:19 +08:00
Adrien Bouttier
d43db5a039
Display mode in statusline like in some airline theme
2017-10-19 13:04:43 +02:00
wsdjeg
4f7836c7f7
Add entrys func for data#dict api
2017-10-18 19:50:38 +08:00
wsdjeg
f98b16e2a3
Add statusline for vim mail
2017-10-18 17:34:19 +08:00
wsdjeg
aaadf7b4fb
Add mail layer
2017-10-18 17:17:33 +08:00
Qian Lei
5f92f42131
typo: fix typo 'colorcolume' in ui.
...
Signed-off-by: Qian Lei <qianlei90@gmail.com>
2017-10-14 17:30:17 +08:00
techgaun
097bc5e6c3
update doc
2017-10-10 14:44:06 -05:00
techgaun
1d6e7a9678
update golang bindings
2017-10-10 14:41:37 -05:00
wsdjeg
b78c45cca1
Fix ycm support
...
close #838
2017-10-10 22:20:47 +08:00
wsdjeg
24bb26af6d
Update indent text
2017-10-08 22:32:00 +08:00
wsdjeg
4dc0603938
Fix markdown layer
2017-10-08 19:36:23 +08:00
wsdjeg
de43970de3
Update lang#vim layer
2017-10-07 23:46:22 +08:00
wsdjeg
9409a81c47
Merge branch 'runner' into dev
2017-10-06 21:49:01 +08:00
wsdjeg
76d184a23a
Fix lint
2017-10-06 21:26:57 +08:00
techgaun
cde8f1b12c
msg about spell-checking (en|dis)abled
2017-10-05 14:03:28 -05:00
techgaun
ef3ad4ccb3
update spell checking
2017-10-05 13:25:35 -05:00
wsdjeg
228beb038d
Add SpaceVimRunner
2017-10-05 20:26:17 +08:00
wsdjeg
89d7e5324d
Add language specified mappings for python
2017-10-05 19:10:01 +08:00
wsdjeg
c10d144b0f
Update shell layer
2017-10-04 21:20:52 +08:00
wsdjeg
81920749c0
Update shell layer
2017-10-04 20:08:19 +08:00
wsdjeg
d620550a58
Add support for editorconfig
2017-10-04 19:19:08 +08:00
wsdjeg
d61a5118e7
Silent jump to buffer
2017-10-04 15:46:45 +08:00
wsdjeg
b16837623d
Silent open tagbar
...
problem:
when open tagbar buffer, you will see message like:
"autoload/SpaceVim/layers/core/tabline.vim" 205 lines --36%--
which is not needed.
2017-10-04 15:33:52 +08:00
wsdjeg
d617c2338b
Show buffer name when there are dup buf
2017-10-04 15:17:06 +08:00
wsdjeg
c83c74830c
Add quit mappings for spacevim
2017-10-04 14:31:01 +08:00
wsdjeg
7c0bbd671b
Add lang#ruby
2017-09-28 21:17:46 +08:00
wsdjeg
51e6ff4861
Merge branch 'lang/ruby' into dev
2017-09-28 21:15:37 +08:00
wsdjeg
9487e25ac2
Merge branch 'jdb' into dev
2017-09-28 21:15:17 +08:00