public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	browser/components/CodeEditor.js
#	browser/finder/NoteDetail.js
This commit is contained in:
Georges Indrianjafy
2018-02-05 11:50:14 +02:00
parent c42ac1df1b 8e1bf48cd1
commit a054f12492
43 changed files with 95 additions and 1811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
browser/components/MarkdownSplitEditor.js
View File

@@ -62,6 +62,7 @@ class MarkdownSplitEditor extends React.Component {
keyMap={config.editor.keyMap}
fontFamily={config.editor.fontFamily}
fontSize={editorFontSize}
displayLineNumbers={config.editor.displayLineNumbers}
indentType={config.editor.indentType}
indentSize={editorIndentSize}
scrollPastEnd={config.editor.scrollPastEnd}