summaryrefslogtreecommitdiffstats
path: root/src/app.js
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-12-13 14:01:33 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2018-12-13 14:01:33 +0100
commitb5937bd427e02d64b675c9c4719ec8148c68c224 (patch)
tree3e67ca01935eb36ab6d40a1e197d7c2c0f38b587 /src/app.js
parentUpdate CHANGELOG.md (diff)
parentIgnore clicks on premium elements (diff)
downloadferdium-app-b5937bd427e02d64b675c9c4719ec8148c68c224.tar.gz
ferdium-app-b5937bd427e02d64b675c9c4719ec8148c68c224.tar.zst
ferdium-app-b5937bd427e02d64b675c9c4719ec8148c68c224.zip
Merge branch 'develop'v5.0.0-beta.21
Diffstat (limited to 'src/app.js')
-rw-r--r--src/app.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/app.js b/src/app.js
index 43d0cf018..831dd93ce 100644
--- a/src/app.js
+++ b/src/app.js
@@ -4,7 +4,9 @@ import React from 'react';
4import { render } from 'react-dom'; 4import { render } from 'react-dom';
5import { Provider } from 'mobx-react'; 5import { Provider } from 'mobx-react';
6import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; 6import { syncHistoryWithStore, RouterStore } from 'mobx-react-router';
7import { Router, Route, hashHistory, IndexRedirect } from 'react-router'; 7import {
8 Router, Route, hashHistory, IndexRedirect,
9} from 'react-router';
8 10
9import '@babel/polyfill'; 11import '@babel/polyfill';
10import smoothScroll from 'smoothscroll-polyfill'; 12import smoothScroll from 'smoothscroll-polyfill';