1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00

Merge v0.5.11

Conflicts:
	browser/main/index.js
	package.json
This commit is contained in:
Rokt33r
2016-04-29 12:25:55 +09:00
33 changed files with 723 additions and 64 deletions

View File

@@ -6,7 +6,7 @@
<link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.min.css" media="screen" charset="utf-8">
<link rel="stylesheet" href="../node_modules/devicon/devicon.min.css">
<link rel="stylesheet" href="../node_modules/highlight.js/styles/xcode.css">
<link rel="stylesheet" href="../node_modules/highlight.js/styles/xcode.css" id="hljs-css">
<link rel="shortcut icon" href="../resources/favicon.ico">
<title>Boostnote</title>
<link rel="stylesheet" href="../resources/katex.min.css">
@@ -56,6 +56,7 @@
<div id="content"></div>
<script src="../submodules/ace/src-min/ace.js"></script>
<script src="../submodules/ace/src-min/ext-themelist.js"></script>
<script src="../resources/katex.min.js"></script>
<script src="../compiled/react.min.js"></script>
<script src="../compiled/react-dom.min.js"></script>