ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/suggestions

Browse Source 
# Conflicts:
#	examples/Components/App/style.scss
#	examples/Components/Subnavigation/index.vue
#	examples/main.js
#	packages/tiptap-extensions/package.json
This commit is contained in:
Philipp Kühn
2018-09-24 15:44:42 +02:00
parent 20a7a490e9 2dd2e3361e
commit b2e73fc0a4
30 changed files with 567 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/Components/Subnavigation/index.vue
View File

@@ -33,6 +33,9 @@
<router-link class="subnavigation__link" to="/mentions">
Mentions
</router-link>
<router-link class="subnavigation__link" to="/placeholder">
Placeholder
</router-link>
<router-link class="subnavigation__link" to="/export">
Export HTML or JSON
</router-link>