Merge pull request #132 from apiaryio/kylef/release-1.3.0

pksunkara · pksunkara · commit cc139ccd4ece · 2016-03-10T04:47:49.000+05:30
Release 1.3.0-pre.0
diff --git a/drafter b/drafter
@@ -1 +1 @@
-Subproject commit f1debe6e756bb14e99856519d76542af3ab9040f
+Subproject commit ad6362ae15e9d17da63e18258965b5c9ea46b596
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "protagonist",
-  "version": "1.2.6",
+  "version": "1.3.0-pre.0",
   "description": "API Blueprint Parser",
   "author": "Apiary.io <support@apiary.io>",
   "main": "./build/Release/protagonist",
diff --git a/test/fixtures/sample-api-refract.json b/test/fixtures/sample-api-refract.json
@@ -193,7 +193,7 @@
                                 ]
                               },
                               "attributes": {
-                                "contentType": "application/json"
+                                "contentType": "application/schema+json"
                               },
                               "content": "{\n  \"$schema\": \"http://json-schema.org/draft-04/schema#\",\n  \"type\": \"object\",\n  \"properties\": {\n    \"id\": {\n      \"type\": \"number\"\n    },\n    \"message\": {\n      \"type\": \"string\",\n      \"description\": \"The Message\"\n    }\n  }\n}"
                             }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "protagonist",`
`3`		`- "version": "1.2.6",`
	`3`	`+ "version": "1.3.0-pre.0",`
`4`	`4`	`"description": "API Blueprint Parser",`
`5`	`5`	`"author": "Apiary.io <support@apiary.io>",`
`6`	`6`	`"main": "./build/Release/protagonist",`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@`
`193`	`193`	`]`
`194`	`194`	`},`
`195`	`195`	`"attributes": {`
`196`		`- "contentType": "application/json"`
	`196`	`+ "contentType": "application/schema+json"`
`197`	`197`	`},`
`198`	`198`	`"content": "{\n \"$schema\": \"http://json-schema.org/draft-04/schema#\",\n \"type\": \"object\",\n \"properties\": {\n \"id\": {\n \"type\": \"number\"\n },\n \"message\": {\n \"type\": \"string\",\n \"description\": \"The Message\"\n }\n }\n}"`
`199`	`199`	`}`