diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2012-03-31 21:32:54 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2012-03-31 21:32:54 +0200 |
| commit | 58cc6431ae7b368f0613066ba1ae9fb00f4fce1d (patch) | |
| tree | 744a198516a736f3375a6c0523ada894c00cc666 /lib/coderay | |
| parent | ff050fe5ead8c3236b17ec9ed78b491298c8f44f (diff) | |
| parent | 9ead89222c42b0f370fdfaae788bcdeb0e82ae18 (diff) | |
| download | coderay-58cc6431ae7b368f0613066ba1ae9fb00f4fce1d.tar.gz | |
Merge remote-tracking branch 'dslh/master'
Diffstat (limited to 'lib/coderay')
| -rw-r--r-- | lib/coderay/helpers/file_type.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb index 7b90918..637001b 100644 --- a/lib/coderay/helpers/file_type.rb +++ b/lib/coderay/helpers/file_type.rb @@ -90,8 +90,8 @@ module CodeRay 'gvy' => :groovy, 'h' => :c, 'haml' => :haml, - 'htm' => :page, - 'html' => :page, + 'htm' => :html, + 'html' => :html, 'html.erb' => :erb, 'java' => :java, 'js' => :java_script, @@ -120,7 +120,7 @@ module CodeRay 'sql' => :sql, # 'ss' => :scheme, 'tmproj' => :xml, - 'xhtml' => :page, + 'xhtml' => :html, 'xml' => :xml, 'yaml' => :yaml, 'yml' => :yaml, |