diff options
author | 2021-08-13 00:45:01 +0530 | |
---|---|---|
committer | 2021-08-13 00:45:01 +0530 | |
commit | 2d27d5e66649d4f5baf127a53ee5ae524eae3a59 (patch) | |
tree | c592ea219ac8cd987fc367f57b54034c450ab2ab /src/app.js | |
parent | Ferdi v5.6.0 (diff) | |
parent | 5.6.1-nightly.24 [skip ci] (diff) | |
download | ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.gz ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.zst ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.zip |
chore: merge from nightly branch into release branch in prep for next beta
Diffstat (limited to 'src/app.js')
-rw-r--r-- | src/app.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/app.js b/src/app.js index aab1729d7..39b50cb33 100644 --- a/src/app.js +++ b/src/app.js | |||
@@ -4,11 +4,8 @@ import React from 'react'; | |||
4 | import { render } from 'react-dom'; | 4 | import { render } from 'react-dom'; |
5 | import { Provider } from 'mobx-react'; | 5 | import { Provider } from 'mobx-react'; |
6 | import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; | 6 | import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; |
7 | import { | 7 | import { hashHistory } from 'react-router'; |
8 | hashHistory, | ||
9 | } from 'react-router'; | ||
10 | 8 | ||
11 | import '@babel/polyfill'; | ||
12 | import smoothScroll from 'smoothscroll-polyfill'; | 9 | import smoothScroll from 'smoothscroll-polyfill'; |
13 | 10 | ||
14 | import ServerApi from './api/server/ServerApi'; | 11 | import ServerApi from './api/server/ServerApi'; |