Permalink
Browse files

Merge remote-tracking branch 'alinex/master'

  • Loading branch information...
2 parents 58ffb6d + 9e649fc commit 2e8f0317121a04f8bd6a194a2504179b8e200cc7 @jbt committed Feb 15, 2014
Showing with 2 additions and 1 deletion.
  1. +2 −1 src/docker.js
View
3 src/docker.js
@@ -815,6 +815,7 @@ Docker.prototype.languages = {
},
coffeescript: {
extensions: [ 'coffee' ],
+ names: [ 'cakefile' ],
executables: [ 'coffee' ],
comment: '#', multiLine: [ /^\s*#{3}\s*$/m, /^\s*#{3}\s*$/m ], jsDoc: true
},
@@ -905,7 +906,7 @@ Docker.prototype.languages = {
},
jade: {
extensions: ['jade'],
- comment: '//', multiLine: [ /\/\*\*?/, /\*\// ], jsDoc: true
+ comment: '//-?', multiLine: [ /\/\*\*?/, /\*\// ], jsDoc: true
},
groovy: {
extensions: ['groovy'],

0 comments on commit 2e8f031

Please sign in to comment.