Merge branch 'master' into return-nil-on-no-ace-mode

This commit is contained in:
Garen Torikian
2014-12-09 09:13:02 -08:00
7 changed files with 103 additions and 1 deletions

View File

@@ -2274,6 +2274,14 @@ Protocol Buffer:
tm_scope: source.protobuf
ace_mode: protobuf
Public Key:
type: data
extensions:
- .asc
- .pub
tm_scope: none
ace_mode: none
Puppet:
type: programming
color: "#cc5555"