Merge branch 'dev' of github.com:jumpserver/luna

fbc73d3d · liuzheng712 · 1769c344 · a67b1ed8 · fbc73d3d
Commit fbc73d3d authored Dec 27, 2017 by liuzheng712
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.gitignore .gitignore +1 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
 # See http://help.github.com/ignore-files/ for more about ignoring files.
+deploy/

 # compiled output
 /dist