mirror of
https://github.com/KevinMidboe/linguist.git
synced 2026-09-24 08:39:10 +00:00
Fix conflicts from merging master into 'mod-extension'
This commit is contained in:
Paul Chaignon
Vendored
+1
-1
Submodule vendor/grammars/AutoHotkey updated: 9b42c86e75...8a9bb55597
Vendored
+1
-1
Submodule vendor/grammars/Docker.tmbundle updated: 8f28cd8714...8ff6e62c89
Vendored
+1
-1
Submodule vendor/grammars/Elm.tmLanguage updated: f52478b0b6...8137f5a48c
Vendored
+1
-1
Submodule vendor/grammars/Handlebars updated: 35d821569d...60532f35cf
Vendored
+1
-1
Submodule vendor/grammars/IDL-Syntax updated: 3baeaeafac...ee1bded38b
Vendored
+1
-1
Submodule vendor/grammars/InnoSetup updated: 875ba96c32...417c64d7b3
Vendored
+1
-1
Submodule vendor/grammars/NimLime updated: e31e1f5329...4acce8b67b
+1
Submodule vendor/grammars/SMT.tmbundle added at 5b8231f516
Vendored
+1
-1
Submodule vendor/grammars/Sublime-Coq updated: 964eb8f914...0909903a9a
Vendored
+1
-1
Submodule vendor/grammars/Sublime-Red updated: 085e0f43b3...def7baed85
Vendored
+1
-1
Submodule vendor/grammars/Sublime-SQF-Language updated: 0313fbe6fb...6d0f3f6cee
Vendored
+1
-1
Submodule vendor/grammars/SublimePapyrus updated: 9ae03977b6...db14899948
Vendored
+1
-1
Submodule vendor/grammars/ada.tmbundle updated: c45eed4d5f...59bfc50221
+1
-1
Submodule vendor/grammars/api-blueprint-sublime-plugin updated: 4713b0e824...e5289f429b
Vendored
+1
-1
Submodule vendor/grammars/asciidoc.tmbundle updated: 28063ea46c...2d3f7a4f58
+1
Submodule vendor/grammars/atom-fsharp added at 55785b6af0
Vendored
+1
-1
Submodule vendor/grammars/ats.sublime updated: 2565468fd4...d6317b2309
Vendored
+1
-1
Submodule vendor/grammars/bro-sublime updated: 7a8983d93e...8219f5ee09
Vendored
+1
-1
Submodule vendor/grammars/carto-atom updated: c00fb6c461...9895909323
Vendored
+1
-1
Submodule vendor/grammars/ceylon-sublimetext updated: 070298013e...67ae76cfb1
Vendored
+1
-1
Submodule vendor/grammars/chapel-tmbundle updated: d52e9b1417...03c5d25641
Vendored
+1
-1
Submodule vendor/grammars/css.tmbundle updated: 2ce91736ca...94f7111c29
Vendored
+1
-1
Submodule vendor/grammars/d.tmbundle updated: a6931961da...f7953e41fd
Vendored
+1
-1
Submodule vendor/grammars/dart-sublime-bundle updated: 2914099c31...67f23dfef2
Vendored
+1
-1
Submodule vendor/grammars/factor updated: 1d1ef9079c...0124e630f0
Vendored
-1
Submodule vendor/grammars/fsharpbinding deleted from e64619da3c
Vendored
+1
-1
Submodule vendor/grammars/gap-tmbundle updated: 291a0469dd...ce4ff698eb
Vendored
+1
-1
Submodule vendor/grammars/grace-tmbundle updated: 2fba162ce7...9e8bb893f0
Vendored
+1
-1
Submodule vendor/grammars/graphviz.tmbundle updated: 2760230b50...d1d489f893
Vendored
+1
-1
Submodule vendor/grammars/haxe-sublime-bundle updated: de60e51dc1...810b34b259
Vendored
+1
-1
Submodule vendor/grammars/html.tmbundle updated: d1231e3da1...e87e8de648
Vendored
+1
-1
Submodule vendor/grammars/idl.tmbundle updated: 95f17ac40b...91baae9134
Vendored
+1
-1
Submodule vendor/grammars/jade-tmbundle updated: 4197de8b70...9ad91309a4
Vendored
-1
Submodule vendor/grammars/javadoc.tmbundle deleted from 5276d7a93f
Vendored
-1
Submodule vendor/grammars/jquery-tmbundle deleted from ff14cd28e3
Vendored
+1
-1
Submodule vendor/grammars/language-clojure updated: b8dfdf5dce...04e308ae4c
+1
-1
Submodule vendor/grammars/language-coffee-script updated: d86c8963dc...99f29d259f
Vendored
+1
-1
Submodule vendor/grammars/language-csharp updated: d07ba8f168...8745f4e545
Vendored
+1
-1
Submodule vendor/grammars/language-gfm updated: 6ca2ea2ac5...7cb930dcaf
Vendored
+1
-1
Submodule vendor/grammars/language-javascript updated: 3028ec95a2...e26b8c50a3
+1
Submodule vendor/grammars/language-jsoniq added at 7a971acf1c
Vendored
+1
-1
Submodule vendor/grammars/language-python updated: 00529e6915...7271315c85
Vendored
+1
-1
Submodule vendor/grammars/language-shellscript updated: 2163c45828...c09554aa3c
Vendored
+1
-1
Submodule vendor/grammars/language-yaml updated: ce8b441467...ee5ab88f59
Vendored
+1
-1
Submodule vendor/grammars/latex.tmbundle updated: 52bed0cd3a...a20438e8e4
Vendored
+1
-1
Submodule vendor/grammars/lisp.tmbundle updated: 0c1d1baa16...6d116d77b6
Vendored
+1
-1
Submodule vendor/grammars/ocaml.tmbundle updated: 903fc45516...8158940052
Vendored
+1
-1
Submodule vendor/grammars/perl.tmbundle updated: b1f624ee3a...fd81fe586b
Vendored
+1
-1
Submodule vendor/grammars/php-smarty.tmbundle updated: cbcdb59cb3...3e673e1980
Vendored
+1
-1
Submodule vendor/grammars/php.tmbundle updated: 7178a102ce...1cba1ac4a9
Vendored
+1
-1
Submodule vendor/grammars/r.tmbundle updated: d602893b72...44691a0773
-1
Submodule vendor/grammars/ruby-on-rails-tmbundle deleted from 0981c4c2ed
Vendored
+1
-1
Submodule vendor/grammars/sas.tmbundle updated: aefac51088...43a05b10fc
Vendored
+1
-1
Submodule vendor/grammars/sass-textmate-bundle updated: 8444f9796e...95e492c5e8
+1
Submodule vendor/grammars/smali-sublime added at b9eba91397
+1
-1
Submodule vendor/grammars/sublime-better-typescript updated: b956adec0a...8c0bd800d9
Vendored
+1
-1
Submodule vendor/grammars/sublime-mask updated: 6f12d2841d...bd37c4e753
Vendored
+1
-1
Submodule vendor/grammars/sublime-netlinx updated: 2bdcfad2a5...a109318915
Vendored
+1
-1
Submodule vendor/grammars/sublime-rust updated: a1c3d2dc96...386d8fcdc5
Vendored
+1
-1
Submodule vendor/grammars/sublime-text-ox updated: 10ca88362c...ed96fb6afc
Vendored
+1
-1
Submodule vendor/grammars/sublime_cobol updated: b848a10104...e7ec606b51
Vendored
-1
Submodule vendor/grammars/text.tmbundle deleted from 961652ad95
Vendored
-1
Submodule vendor/grammars/textile.tmbundle deleted from 6951fec27c
Vendored
-1
Submodule vendor/grammars/textmate.tmbundle deleted from 49270318d5
Reference in New Issue
Block a user