Merge branch 'develop' into greenkeeper/scratch-l10n-3.0.20180926203705

This commit is contained in:
Andrew Sliwinski authored and GitHub committed 2018-09-26 17:57:28 -04:00
commit d44aedfd48
2 files changed
+7 -5

No files matched your search

+5 -5
View File
@@ -82,8 +82,8 @@
"react-draggable": "3.0.5",
"react-ga": "2.5.3",
"react-intl": "2.4.0",
"react-modal": "3.5.1",
"react-popover": "0.5.7",
"react-modal": "3.6.1",
"react-popover": "0.5.10",
"react-redux": "5.0.7",
"react-responsive": "5.0.0",
"react-style-proptype": "3.2.2",
@@ -96,10 +96,10 @@
"redux-throttle": "0.1.1",
"rimraf": "^2.6.1",
"scratch-audio": "0.1.0-prerelease.20180625202813",
"scratch-blocks": "0.1.0-prerelease.1537303399",
"scratch-blocks": "0.1.0-prerelease.1537975589",
"scratch-l10n": "3.0.20180926203705",
"scratch-paint": "0.2.0-prerelease.20180918203812",
"scratch-render": "0.1.0-prerelease.20180918201144",
"scratch-paint": "0.2.0-prerelease.20180926191006",
"scratch-render": "0.1.0-prerelease.20180926153819",
"scratch-storage": "1.0.2",
"scratch-svg-renderer": "0.2.0-prerelease.20180926143036",
"scratch-vm": "0.2.0-prerelease.20180925190229",
+2
View File
@@ -1,4 +1,5 @@
import GUI from './containers/gui.jsx';
import AppStateHOC from './lib/app-state-hoc.jsx';
import GuiReducer, {guiInitialState, guiMiddleware, initFullScreen, initPlayer} from './reducers/gui';
import LocalesReducer, {localesInitialState, initLocale} from './reducers/locales';
import {ScratchPaintReducer} from 'scratch-paint';
@@ -13,6 +14,7 @@ const guiReducers = {
export {
GUI as default,
AppStateHOC,
setAppElement,
guiReducers,
guiInitialState,