diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-22 23:43:29 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-22 23:43:29 +0200 |
| commit | ffe0c90999c0b7255a5dfc608c84e683440475b1 (patch) | |
| tree | daa3914a8ff8f3272c7838dc4f057c4589126d85 /lib/coderay/helpers | |
| parent | 196b7296666c12b0c04fa6b8dc42e46ed9331432 (diff) | |
| parent | 2abfc49bdc9a9f4e86c90aa968c302ca76c20812 (diff) | |
| download | coderay-ffe0c90999c0b7255a5dfc608c84e683440475b1.tar.gz | |
Merge branch 'master' into cleanup-output
Diffstat (limited to 'lib/coderay/helpers')
| -rw-r--r-- | lib/coderay/helpers/file_type.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb index 6144e8c..19f27ac 100644 --- a/lib/coderay/helpers/file_type.rb +++ b/lib/coderay/helpers/file_type.rb @@ -120,6 +120,7 @@ module CodeRay 'sass' => :sass, 'sql' => :sql, 'taskpaper' => :taskpaper, + 'template' => :json, # AWS CloudFormation template 'tmproj' => :xml, 'xaml' => :xml, 'xhtml' => :html, |