Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

logging-scratch-gui
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

6fc77d2b

Unverified Commit 6fc77d2b authored 6 years ago by Andrew Sliwinski Committed by GitHub 6 years ago

Downloads
- Plain Diff

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

parents 6e30eeae 3a88e418

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

package.json 3 additions, 3 deletions

package.json
src/components/language-selector/language-selector.jsx 1 addition, 1 deletion

src/components/language-selector/language-selector.jsx
src/containers/sprite-selector-item.jsx 17 additions, 5 deletions

src/containers/sprite-selector-item.jsx
src/containers/stage.jsx 3 additions, 3 deletions

src/containers/stage.jsx
src/lib/app-state-hoc.jsx 18 additions, 6 deletions

src/lib/app-state-hoc.jsx
src/lib/libraries/decks/index.jsx 30 additions, 16 deletions

src/lib/libraries/decks/index.jsx
src/lib/tutorial-from-url.js 48 additions, 0 deletions

src/lib/tutorial-from-url.js
src/reducers/gui.js 25 additions, 1 deletion

src/reducers/gui.js
test/integration/project-loading.test.js 1 addition, 1 deletion

test/integration/project-loading.test.js

with 146 additions and 36 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment