Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

Front-end app
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

35080dd3

Commit 35080dd3 authored 3 years ago by FrankR

Downloads
- Plain Diff

Merge branch 'master' of https://git-st.inf.tu-dresden.de/ipos/front-end-app

# Conflicts:
#	src/app/components/pick-list/pick-list.component.html

parents 385f11a2 bb7db820

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

src/app/app.component.html 1 addition, 11 deletions

src/app/app.component.html
src/app/components/pick-list/pick-list.component.html 16 additions, 16 deletions

src/app/components/pick-list/pick-list.component.html

with 17 additions and 27 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