1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00

Merge branch 'master' into feat/display-url-title

# Conflicts:
#	browser/components/CodeEditor.js
#	browser/finder/NoteDetail.js
This commit is contained in:
Georges Indrianjafy
2018-02-05 11:50:14 +02:00
43 changed files with 95 additions and 1811 deletions

View File

@@ -242,6 +242,7 @@ class MarkdownEditor extends React.Component {
fontSize={editorFontSize}
indentType={config.editor.indentType}
indentSize={editorIndentSize}
displayLineNumbers={config.editor.displayLineNumbers}
scrollPastEnd={config.editor.scrollPastEnd}
storageKey={storageKey}
fetchUrlTitle={config.editor.fetchUrlTitle}