Merge branch '3.6' of github.com:bolt/bolt into 3.6

bolt · Oct 9, 2018 · f836867 · f836867
2 parents 91219d7 + 3a7070f
commit f836867
Show file tree

Hide file tree

Showing 14 changed files with 1,452 additions and 386 deletions.
diff --git a/app/src/package.json b/app/src/package.json
@@ -32,7 +32,7 @@
         "deep-extend": "~0.6.0",
         "grunt": "~1.0.3",
         "grunt-bom-removal": "~1.0.1",
-        "grunt-bootlint": "~0.10.2",
+        "grunt-bootlint": "~0.11.1",
         "grunt-contrib-concat": "~1.0.1",
         "grunt-contrib-copy": "~1.0.0",
         "grunt-contrib-uglify": "~3.4.0",

diff --git a/app/src/yarn.lock b/app/src/yarn.lock
diff --git a/app/view/js/bolt.js b/app/view/js/bolt.js
diff --git a/app/view/js/ckeditor/plugins/codemirror/plugins/clike.min.js b/app/view/js/ckeditor/plugins/codemirror/plugins/clike.min.js
diff --git a/app/view/js/ckeditor/plugins/codemirror/plugins/css.min.js b/app/view/js/ckeditor/plugins/codemirror/plugins/css.min.js
diff --git a/app/view/js/ckeditor/plugins/codemirror/plugins/fold/foldgutter.min.js b/app/view/js/ckeditor/plugins/codemirror/plugins/fold/foldgutter.min.js
diff --git a/app/view/js/ckeditor/plugins/codemirror/plugins/markdown.min.js b/app/view/js/ckeditor/plugins/codemirror/plugins/markdown.min.js
diff --git a/app/view/js/ckeditor/plugins/codemirror/plugins/matchbrackets.min.js b/app/view/js/ckeditor/plugins/codemirror/plugins/matchbrackets.min.js