Merge remote-tracking branch 'origin/main' (48e963d1) · Commits · SE2 Projekt / Tasty Pages · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tasty Pages
- Activity
- Members
- Labels
- Terraform modules
- Incidents
- Contributor analytics
- Model experiments

Snippets Groups Projects

48e963d1

Commit 48e963d1 authored 1 year ago by Dirksmöller Karin

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main'

parents 2210bca4 a59575b3

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/mi/hdm/TastyPages.java 1 addition, 0 deletions

src/main/java/mi/hdm/TastyPages.java
src/main/java/mi/hdm/controllers/BaseController.java 4 additions, 0 deletions

src/main/java/mi/hdm/controllers/BaseController.java
src/main/java/mi/hdm/controllers/View.java 0 additions, 1 deletion

src/main/java/mi/hdm/controllers/View.java
src/main/resources/fxml/Meal_Plan.fxml 7 additions, 7 deletions

src/main/resources/fxml/Meal_Plan.fxml

with 12 additions and 8 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