Merge branch 'master' into searchbar-update

2017-04-28 08:39:16 -07:00
parent ca808e9d18 5a5a4d016b
commit 8a1e447f0f
101 changed files with 1299 additions and 898 deletions
--- a/src/plugins/topbar/index.js
+++ b/src/plugins/topbar/index.js
@@ -1,4 +1,4 @@
-import Topbar from './topbar.jsx'
+import Topbar from "./topbar.jsx"

 export default function () {
  return {