Merge branch 'master' into 817-updated

Conflicts: lib/linguist/samples.json
2025-12-08 04:18:48 +00:00 · 2014-04-21 11:23:48 -05:00
parent 98dacd07c2 701f5220fc
commit 00ff4a1d8a
6 changed files with 1627 additions and 4 deletions
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -618,7 +618,7 @@ Fancy:
  - .fancypack
  filenames:
  - Fakefile
-  
+
 Fantom:
  type: programming
  color: "#dbded5"
@@ -632,6 +632,12 @@ Forth:
  extensions:
  - .4th

+Frege:
+  type: programming
+  color: "#00cafe"
+  lexer: Haskell
+  primary_extension: .fr
+
 Game Maker Language:
  type: programming
  lexer: JavaScript