Merge branch 'develop' into greenkeeper/scratch-render-0.1.0-prerelease.20180502115145
No related branches found
No related tags found
Showing
- package.json 2 additions, 2 deletionspackage.json
- src/.eslintrc.js 2 additions, 1 deletionsrc/.eslintrc.js
- src/components/browser-modal/browser-modal.jsx 24 additions, 8 deletionssrc/components/browser-modal/browser-modal.jsx
- src/components/crash-message/crash-message.jsx 6 additions, 0 deletionssrc/components/crash-message/crash-message.jsx
- src/components/menu-bar/menu-bar.jsx 68 additions, 11 deletionssrc/components/menu-bar/menu-bar.jsx
- src/components/prompt/prompt.jsx 10 additions, 2 deletionssrc/components/prompt/prompt.jsx
- src/components/question/question.jsx 1 addition, 1 deletionsrc/components/question/question.jsx
- src/components/record-modal/playback-step.jsx 7 additions, 1 deletionsrc/components/record-modal/playback-step.jsx
- src/components/stage-selector/stage-selector.jsx 7 additions, 1 deletionsrc/components/stage-selector/stage-selector.jsx
- src/containers/costume-tab.jsx 6 additions, 3 deletionssrc/containers/costume-tab.jsx
- src/containers/paint-editor-wrapper.jsx 24 additions, 9 deletionssrc/containers/paint-editor-wrapper.jsx
- src/lib/libraries/backdrops.json 28 additions, 0 deletionssrc/lib/libraries/backdrops.json
- src/lib/libraries/costumes.json 777 additions, 7 deletionssrc/lib/libraries/costumes.json
- src/lib/libraries/sprites.json 1417 additions, 86 deletionssrc/lib/libraries/sprites.json
- test/helpers/selenium-helper.js 1 addition, 1 deletiontest/helpers/selenium-helper.js
Loading
Please register or sign in to comment