Merge branch 'master' into apollo

This commit is contained in:
Arfon Smith
2016-07-13 09:41:15 -06:00

View File

@@ -1358,7 +1358,6 @@ GraphQL:
type: data
extensions:
- .graphql
color: "#E535AB"
tm_scope: source.graphql
ace_mode: text
@@ -2225,7 +2224,6 @@ Markdown:
- .mkdown
- .ron
tm_scope: source.gfm
color: "#083FA1"
Mask:
type: markup
@@ -3105,7 +3103,6 @@ RDoc:
extensions:
- .rdoc
tm_scope: text.rdoc
color: "#8E84BF"
REALbasic:
type: programming
@@ -3996,7 +3993,6 @@ WebIDL:
World of Warcraft Addon Data:
type: data
color: "#e0b330"
extensions:
- .toc
tm_scope: source.toc
@@ -4306,7 +4302,6 @@ reStructuredText:
- .rest.txt
- .rst.txt
ace_mode: text
color: "#B3BCBC"
wisp:
type: programming