Merge branch 'develop' into 3584-public-file-url #3584

IQSS · Feb 6, 2017 · 11be4dd · 11be4dd
2 parents f8dbcaa + 1ba73ed
commit 11be4dd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ ehthumbs.db
 Thumbs.db
 .vagrant
 *.pyc
+*.swp
 scripts/api/py_api_wrapper/demo-data/*
 scripts/api/py_api_wrapper/test_data/*
 scripts/api/py_api_wrapper/local-data/*
@@ -25,4 +26,4 @@ src/main/java/BuildNumber.properties
 /nbproject/
 oauth-credentials.md
 
-/src/main/webapp/oauth2/newAccount.html
+/src/main/webapp/oauth2/newAccount.html