merged from master

2015-12-11 11:16:55 -08:00
parent c578a530af ea13a647ce
commit 2e28c4c2de
6 changed files with 1362 additions and 1329 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 * text eol=lf
-
+src/**/*.ttf binary
 dist/**/*.js binary
 dist/**/*.ttf binary
 dist/**/*.map binary
--- a/dist/fonts/DroidSans-Bold.ttf
+++ b/dist/fonts/DroidSans-Bold.ttf
--- a/dist/fonts/DroidSans.ttf
+++ b/dist/fonts/DroidSans.ttf
--- a/dist/swagger-ui.js
+++ b/dist/swagger-ui.js
--- a/dist/swagger-ui.min.js
+++ b/dist/swagger-ui.min.js
--- a/package.json
+++ b/package.json
@@ -50,6 +50,6 @@
    "less": "^2.4.0",
    "mocha": "^2.1.0",
    "selenium-webdriver": "^2.45.0",
-    "swagger-client": "2.1.8"
+    "swagger-client": "2.1.9"
  }
 }