Merge branch 'master' into sls-syntax

sharkdp · Sep 10, 2019 · 14c8937 · 14c8937
2 parents 743b6b0 + 12330fd
commit 14c8937
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -153,7 +153,11 @@
 [submodule "assets/syntaxes/Strace"]
 	path = assets/syntaxes/Strace
 	url = https://github.com/djuretic/SublimeStrace
+[submodule "assets/syntaxes/Jinja2"]
+	path = assets/syntaxes/Jinja2
+	url = https://github.com/Martin819/sublime-jinja2
+	branch = master
 [submodule "assets/syntaxes/SLS"]
 	path = assets/syntaxes/SLS
 	url = https://github.com/saltstack/sublime-text
-	branch = master
+  
diff --git a/README.md b/README.md
@@ -538,6 +538,11 @@ bash assets/create.sh
 cargo install -f
 ```
 
+## Maintainers
+
+- [sharkdp](https://github.com/sharkdp)
+- [eth-p](https://github.com/eth-p)
+
 ## Project goals and alternatives
 
 `bat` tries to achieve the following goals:

diff --git a/assets/syntaxes/Jinja2 b/assets/syntaxes/Jinja2