Merge branch 'master' into develop

jisoldi · jisoldi · commit fd95145980b8 · 2017-03-14T17:36:00.000-03:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:4.1
+FROM node:4.7
 
 # Install Ruby (for Gem)
 RUN apt-get update \
diff --git a/README.md b/README.md
@@ -109,7 +109,7 @@ In *Single View* mode you will be able to see only documentation or try-it.
 
 *Resources* can be collapsed if needed by adding the following setting:
 
-    <raml-console-loader src="path-to-raml" options="{ resourceCollapsed: true }"></raml-console-loader>
+    <raml-console-loader src="path-to-raml" options="{ resourcesCollapsed: true }"></raml-console-loader>
 
 ### Documentation collapsed
 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "api-console",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "repository": {
     "type": "git",
     "url": "https://github.com/mulesoft/api-console.git"
diff --git a/dist/scripts/api-console-vendor.js b/dist/scripts/api-console-vendor.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api-console",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "description": "Api-Console for RAML based app",
   "files": [
     "dist",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "api-console",`
`3`		`- "version": "3.0.14",`
	`3`	`+ "version": "3.0.15",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "https://github.com/mulesoft/api-console.git"`