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

fd44e68b

Commit fd44e68b authored 5 years ago by M3034

Downloads
- Plain Diff

Merge branch 'development' into '25-pelinluontilomake'

# Conflicts:
#   src/App.css

parents 8044b0a4 09483065

No related branches found

No related tags found

3 merge requests!21Development,!15Get game creation to user-marker-database-interactions,!13Resolve "Pelinluontilomake"

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/App.css 54 additions, 13 deletions

src/App.css
src/components/DrawTools.js 174 additions, 59 deletions

src/components/DrawTools.js
src/components/UserMap.js 49 additions, 33 deletions

src/components/UserMap.js
src/icons/button-textbox.png 0 additions, 0 deletions

src/icons/button-textbox.png
src/icons/nil.png 0 additions, 0 deletions

src/icons/nil.png

with 277 additions and 105 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