summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--CHANGELOG.md2
m---------assets/syntaxes/02_Extra/Slim0
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index f4bec7bd..5f28570c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -227,3 +227,6 @@
[submodule "assets/syntaxes/02_Extra/LLVM"]
path = assets/syntaxes/02_Extra/LLVM
url = https://github.com/ioncodes/LLVM.tmBundle
+[submodule "assets/syntaxes/02_Extra/Slim"]
+ path = assets/syntaxes/02_Extra/Slim
+ url = https://github.com/slim-template/ruby-slim.tmbundle.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 707ea220..04602770 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@
- LLVM, see #1777 (@ioncodes)
- Highlight for `vimrc` and `gvimrc` files, see #1763 (@SuperSandro2000)
- Syslog highlighting improvements, see #1793 (@scop)
-
+- Added support for `slim` syntax, see #1693 (@mfinelli)
## New themes
diff --git a/assets/syntaxes/02_Extra/Slim b/assets/syntaxes/02_Extra/Slim
new file mode 160000
+Subproject 3b1441f89fde40678c3c0ada6d75ce46417a35b