Merge branch 'master' of https://github.com/jack775544/jTransfer

jack775544 · May 25, 2016 · e12b856 · e12b856
2 parents 005d526 + cba800c
commit e12b856
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ out
 
 # Windows
 desktop.ini
+Thumbs.db
 
 # Package Files
 *.war
@@ -26,4 +27,5 @@ hs_err_pid*
 # Temp artifacts
 /__artifacts_temp
 
-deploy
+deploy
+deploy.bat