Merge remote-tracking branch 'origin/master' (777f85d3) · 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

777f85d3

There was an error fetching the commit references. Please try again later.

Commit 777f85d3 authored 1 month ago by

Luisa Wenz

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	userman_all/server/doc/index.html

parents 3c4d1acf 41951ad1

No related merge requests found

Changes 6

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/doc/index.html 10 additions, 10 deletions

userman_all/server/doc/index.html
userman_all/server/src/server.ts 21 additions, 31 deletions

userman_all/server/src/server.ts
userman_all/server/test/horizon_changers.http 19 additions, 11 deletions

userman_all/server/test/horizon_changers.http

with 81 additions and 110 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