Merge branch 'refs/heads/delete-route' (4548d44f) · Commits · Sophia Haupt / IP1_Gruppe8 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

IP1_Gruppe8
- Activity
- Members
- Releases
- Package Registry
- Terraform modules
- Contributor analytics
- Repository analytics

Snippets Groups Projects

4548d44f

Commit 4548d44f authored 1 month ago by

Sarah Gloger

Downloads
- Plain Diff

Merge branch 'refs/heads/delete-route'

# Conflicts:
#	userman_all/client/index.html

parents 0e7bf3ba 94a4f35d

Branches

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

userman_all/client/index.html 25 additions, 2 deletions

userman_all/client/index.html
userman_all/client/src/client.ts 38 additions, 4 deletions

userman_all/client/src/client.ts
userman_all/client/stylesheet.css 28 additions, 1 deletion

userman_all/client/stylesheet.css
userman_all/server/src/server.ts 46 additions, 10 deletions

userman_all/server/src/server.ts

with 137 additions and 17 deletions

0% 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