Merge branch 'deleteundmaster' (894bfc9b) · 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

894bfc9b

Commit 894bfc9b authored 1 month ago by

„Sophia

Downloads
- Plain Diff

Merge branch 'deleteundmaster'

# Conflicts:
#	userman_all/server/test/horizon_changers.http

parents 849fa54e 7aa156dd

Branches luisa

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

userman_all/client/index.html 17 additions, 49 deletions

userman_all/client/index.html
userman_all/client/src/client.ts 13 additions, 8 deletions

userman_all/client/src/client.ts
userman_all/client/stylesheet.css 1 addition, 1 deletion

userman_all/client/stylesheet.css
userman_all/server/test/horizon_changers.http 16 additions, 7 deletions

userman_all/server/test/horizon_changers.http

with 47 additions and 65 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