Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
agustin committed Jan 17, 2017
2 parents 3f09de2 + 48b7082 commit b755fbd
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 8,967 deletions.
4 changes: 1 addition & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ module.exports = function (grunt) {
js: ['src/**/*.js'],
jsVendor: [
'bower_components/marked/lib/marked.js',
'bower_components/raml-1-parser-browser/browser_version/index.js',
'bower_components/raml-json-validation-browser/browser_version_bower/index.js',
'bower_components/raml-xml-validation-browser/browser_version_bower/index.js',
'bower_components/raml-1-parser/raml-1-parser.js',
'bower_components/highlightjs/highlight.pack.js',
'bower_components/vkbeautify/vkbeautify.js',
'bower_components/jquery/dist/jquery.js',
Expand Down
4 changes: 1 addition & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
"jszip": "~2.0.0",
"marked": "~0.3.1",
"raml-client-generator": "~0.0.7",
"raml-1-parser-browser": "1.1.13",
"raml-xml-validation-browser": "0.0.11",
"raml-json-validation-browser": "0.0.11",
"raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.1.13/raml-1-parser.zip",
"resolve-url": "~0.2.1",
"slug": "~0.8.0",
"velocity": "~1.1.0",
Expand Down
8,831 changes: 49 additions & 8,782 deletions dist/scripts/api-console-vendor.js

Large diffs are not rendered by default.

227 changes: 48 additions & 179 deletions dist/scripts/api-console-vendor.min.js

Large diffs are not rendered by default.

0 comments on commit b755fbd

Please sign in to comment.