Merge upstream changes into topic branch

This commit is contained in:
Alhadis
2016-10-07 10:25:03 +11:00
3 changed files with 9 additions and 3 deletions

View File

@@ -19,7 +19,7 @@
# language_id - Integer used as a language-name-independent indexed field so that we can rename
# languages in Linguist without reindexing all the code on GitHub. Must not be
# changed for existing languages without the explicit permission of GitHub staff.
# color - CSS hex color to represent the language.
# color - CSS hex color to represent the language. Only used if type is "programming" or "prose"
# tm_scope - The TextMate scope that represents this programming
# language. This should match one of the scopes listed in
# the grammars.yml file. Use "none" if there is no grammar
@@ -103,7 +103,6 @@ APL:
language_id: 6
ASN.1:
type: data
color: "#aeead0"
extensions:
- ".asn"
- ".asn1"