Merge branch 'dev'

hexojs · Mar 29, 2013 · a70b2d1 · a70b2d1
2 parents dbc8b92 + fdfd885
commit a70b2d1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/util/highlight.js b/lib/util/highlight.js
@@ -7,6 +7,7 @@ var alias = {
   html: 'xml',
   htm: 'xml',
   coffee: 'coffeescript',
+  'coffee-script': 'coffeescript',
   yml: 'yaml',
   pl: 'perl',
   ru: 'ruby',