Merge branch 'master' into 3227-local

2025-12-08 12:28:47 +00:00 · 2016-09-21 20:55:07 -07:00
parent c8094d3775 d6d7d38eb8
commit 6fcba83f3e
2 changed files with 5 additions and 0 deletions
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -585,6 +585,7 @@ module Linguist
      :aliases           => options['aliases'],
      :tm_scope          => options['tm_scope'],
      :ace_mode          => options['ace_mode'],
+      :codemirror_mode   => options['codemirror_mode'],
      :wrap              => options['wrap'],
      :group_name        => options['group'],
      :searchable        => options.fetch('searchable', true),