Merge branch '25-pelinluontilomake' into 'gamelist' (5435b699) · Commits · WIMMA Lab 2019 / Overflow / ehasa-frontend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ehasa-frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5435b699

Commit 5435b699 authored 5 years ago by H9031

Downloads
- Plain Diff

Merge branch '25-pelinluontilomake' into 'gamelist'

# Conflicts:
#   src/App.js
#   src/components/Header.js

parents 96d59a83 91e1c39b

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

public/index.html 1 addition, 0 deletions

public/index.html
src/App.css 18 additions, 1 deletion

src/App.css
src/App.js 1 addition, 0 deletions

src/App.js
src/components/Header.js 19 additions, 11 deletions

src/components/Header.js
src/components/NewGameForm.js 191 additions, 0 deletions

src/components/NewGameForm.js

with 230 additions and 12 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