merged with master

2015-04-16 12:29:26 -07:00
parent aadae973df ba51722989
commit 843e86b5cc
9 changed files with 4 additions and 4 deletions
--- a/src/main/html/images/explorer_icons.png
+++ b/src/main/html/images/explorer_icons.png
--- a/src/main/html/images/favicon-16x16.png
+++ b/src/main/html/images/favicon-16x16.png
--- a/src/main/html/images/favicon-32x32.png
+++ b/src/main/html/images/favicon-32x32.png
--- a/src/main/html/images/logo_small.png
+++ b/src/main/html/images/logo_small.png
--- a/src/main/html/images/pet_store_api.png
+++ b/src/main/html/images/pet_store_api.png
--- a/src/main/html/images/wordnik_api.png
+++ b/src/main/html/images/wordnik_api.png
--- a/src/main/javascript/view/HeaderView.js
+++ b/src/main/javascript/view/HeaderView.js
@@ -13,7 +13,7 @@ SwaggerUi.Views.HeaderView = Backbone.View.extend({

  showPetStore: function(){
    this.trigger('update-swagger-ui', {
-      url:'http://petstore.swagger.wordnik.com/api/api-docs'
+      url:'http://petstore.swagger.io/v2/swagger.json'
    });
  },

@@ -52,4 +52,4 @@ SwaggerUi.Views.HeaderView = Backbone.View.extend({
      this.trigger('update-swagger-ui', {url:url});
    }
  }
-});
+});