Merge branch 'development' into 'get-own-location' (9a4ec122) · 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

9a4ec122

Commit 9a4ec122 authored 5 years ago by M3034

Downloads
- Plain Diff

Merge branch 'development' into 'get-own-location'

Pls work ;--(
# Conflicts:
#   src/components/UserMap.js

parents 22a6f910 45408cf6

No related branches found

No related tags found

1 merge request!3Get own location

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 29 additions, 13 deletions

package-lock.json
package.json 5 additions, 1 deletion

package.json
src/App.css 4 additions, 3 deletions

src/App.css
src/App.js 4 additions, 0 deletions

src/App.js
src/App_3.js 367 additions, 0 deletions

src/App_3.js
src/components/DrawTools.js 63 additions, 0 deletions

src/components/DrawTools.js
src/components/UserMap.js 10 additions, 2 deletions

src/components/UserMap.js

with 482 additions and 19 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