diff options
author | ThibG <thib@sitedethib.com> | 2019-09-19 00:22:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-19 00:22:39 +0200 |
commit | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (patch) | |
tree | 1a99988dd7a46824527e59ee1861aa72ad7412ce /app/javascript/flavours/glitch/packs/public.js | |
parent | ab646fac5f582fe9bef22d8b9a4995fbb4b42d7d (diff) | |
parent | 2ecc7106d7fc222ca84777fc279e9f46f80afd5a (diff) |
Merge pull request #1221 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/packs/public.js')
-rw-r--r-- | app/javascript/flavours/glitch/packs/public.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/packs/public.js b/app/javascript/flavours/glitch/packs/public.js index 72725d20b..019de2167 100644 --- a/app/javascript/flavours/glitch/packs/public.js +++ b/app/javascript/flavours/glitch/packs/public.js @@ -11,10 +11,10 @@ function main() { const React = require('react'); const ReactDOM = require('react-dom'); const Rellax = require('rellax'); - const createHistory = require('history').createBrowserHistory; + const { createBrowserHistory } = require('history'); const scrollToDetailedStatus = () => { - const history = createHistory(); + const history = createBrowserHistory(); const detailedStatuses = document.querySelectorAll('.public-layout .detailed-status'); const location = history.location; |