Merge branch 'master' into feature/suggestions

# Conflicts: # packages/tiptap-extensions/package.json
2018-09-04 23:12:00 +02:00
parent c716fe605f 518413e33f
commit 0e3810bca0
24 changed files with 1045 additions and 652 deletions
--- a/examples/Components/Subnavigation/index.vue
+++ b/examples/Components/Subnavigation/index.vue
@@ -21,6 +21,9 @@
 		<router-link class="subnavigation__link" to="/markdown-shortcuts">
 			Markdown Shortcuts
 		</router-link>
+		<router-link class="subnavigation__link" to="/code-highlighting">
+			Code Highlighting
+		</router-link>
 		<router-link class="subnavigation__link" to="/read-only">
 			Read-Only
 		</router-link>