diff options
| author | sangoh.hong <limfreee@gmail.com> | 2019-01-11 22:35:20 +0900 |
|---|---|---|
| committer | sangoh.hong <limfreee@gmail.com> | 2019-01-11 22:35:20 +0900 |
| commit | 3bbe63715462e859cd7d04872ca13df9d0a9c534 (patch) | |
| tree | 7cc155ddb69ae9a01c9f2c1b42f6c481c38be74c /.gitignore | |
| parent | e608921992942ebcb3d62cf0c9c89671ce08b775 (diff) | |
| parent | 41f48265223fab951c5cc76da837cb4766cd2c06 (diff) | |
Merge branch 'develop' into feature/curses-browser-paging
# Conflicts:
# .gitignore
# glances/outputs/glances_curses_browser.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -48,4 +48,5 @@ _build node_modules/ bower_components/ -.vscode/
\ No newline at end of file +# visual stdio code +.vscode/ |