Merge branch 'develop' into greenkeeper/scratch-paint-0.2.0-prerelease.20180712195436
No related branches found
No related tags found
Showing
- package.json 4 additions, 4 deletionspackage.json
- src/components/connection-modal/connection-modal.css 4 additions, 0 deletionssrc/components/connection-modal/connection-modal.css
- src/components/connection-modal/connection-modal.jsx 4 additions, 1 deletionsrc/components/connection-modal/connection-modal.jsx
- src/components/connection-modal/icons/scratch-link.png 0 additions, 0 deletionssrc/components/connection-modal/icons/scratch-link.png
- src/components/connection-modal/unavailable-step.jsx 76 additions, 0 deletionssrc/components/connection-modal/unavailable-step.jsx
- src/containers/connection-modal.jsx 11 additions, 3 deletionssrc/containers/connection-modal.jsx
- src/containers/costume-library.jsx 6 additions, 2 deletionssrc/containers/costume-library.jsx
- src/containers/costume-tab.jsx 6 additions, 2 deletionssrc/containers/costume-tab.jsx
- src/containers/stage.jsx 2 additions, 0 deletionssrc/containers/stage.jsx
- src/lib/file-uploader.js 16 additions, 11 deletionssrc/lib/file-uploader.js
- src/lib/libraries/backdrops.json 640 additions, 79 deletionssrc/lib/libraries/backdrops.json
- src/lib/libraries/costumes.json 2238 additions, 332 deletionssrc/lib/libraries/costumes.json
- src/lib/libraries/extensions/index.jsx 3 additions, 3 deletionssrc/lib/libraries/extensions/index.jsx
- src/lib/libraries/sprites.json 5872 additions, 3675 deletionssrc/lib/libraries/sprites.json
Loading
Please register or sign in to comment