Skip to content

Commit d44aedf

Browse files
authored
Merge branch 'develop' into greenkeeper/scratch-l10n-3.0.20180926203705
2 parents f14816e + 10b93e4 commit d44aedf

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
"react-draggable": "3.0.5",
8383
"react-ga": "2.5.3",
8484
"react-intl": "2.4.0",
85-
"react-modal": "3.5.1",
86-
"react-popover": "0.5.7",
85+
"react-modal": "3.6.1",
86+
"react-popover": "0.5.10",
8787
"react-redux": "5.0.7",
8888
"react-responsive": "5.0.0",
8989
"react-style-proptype": "3.2.2",
@@ -96,10 +96,10 @@
9696
"redux-throttle": "0.1.1",
9797
"rimraf": "^2.6.1",
9898
"scratch-audio": "0.1.0-prerelease.20180625202813",
99-
"scratch-blocks": "0.1.0-prerelease.1537303399",
99+
"scratch-blocks": "0.1.0-prerelease.1537975589",
100100
"scratch-l10n": "3.0.20180926203705",
101-
"scratch-paint": "0.2.0-prerelease.20180918203812",
102-
"scratch-render": "0.1.0-prerelease.20180918201144",
101+
"scratch-paint": "0.2.0-prerelease.20180926191006",
102+
"scratch-render": "0.1.0-prerelease.20180926153819",
103103
"scratch-storage": "1.0.2",
104104
"scratch-svg-renderer": "0.2.0-prerelease.20180926143036",
105105
"scratch-vm": "0.2.0-prerelease.20180925190229",

src/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import GUI from './containers/gui.jsx';
2+
import AppStateHOC from './lib/app-state-hoc.jsx';
23
import GuiReducer, {guiInitialState, guiMiddleware, initFullScreen, initPlayer} from './reducers/gui';
34
import LocalesReducer, {localesInitialState, initLocale} from './reducers/locales';
45
import {ScratchPaintReducer} from 'scratch-paint';
@@ -13,6 +14,7 @@ const guiReducers = {
1314

1415
export {
1516
GUI as default,
17+
AppStateHOC,
1618
setAppElement,
1719
guiReducers,
1820
guiInitialState,

0 commit comments

Comments
 (0)