Philipp Kühn b2e73fc0a4 Merge branch 'master' into feature/suggestions ... # Conflicts: # examples/Components/App/style.scss # examples/Components/Subnavigation/index.vue # examples/main.js # packages/tiptap-extensions/package.json		2018-09-24 15:44:42 +02:00
..
index.vue	Merge branch 'master' into feature/suggestions	2018-09-24 15:44:42 +02:00
style.scss	disable sticky navigation for mobile	2018-08-23 08:06:09 +02:00