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

f439d86a

Commit f439d86a authored 5 years ago by L4929

Downloads
- Plain Diff

Merge branch 'development' into 'rectangle-circle-bug'

# Conflicts:
#   src/components/DrawTools.js

parents cc62ff38 09483065

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/App.css 55 additions, 13 deletions

src/App.css
src/components/DrawTools.js 144 additions, 0 deletions

src/components/DrawTools.js
src/components/UserMap.js 38 additions, 32 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 237 additions and 45 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