Skip to content
Snippets Groups Projects
Commit ac12e18f authored by Karsch Lukas's avatar Karsch Lukas
Browse files

Merge branch 'main' into 'implementing_file_manager' 

# Conflicts:
#   src/main/java/mi/hdm/TastyPages.java
#   src/main/java/mi/hdm/controllers/BaseController.java
#   src/main/java/mi/hdm/controllers/HeaderController.java
#   src/main/java/mi/hdm/controllers/MainPageController.java
#   src/main/java/mi/hdm/recipes/Recipe.java
#   src/main/java/mi/hdm/recipes/RecipeSearch.java
#   src/test/java/mi/hdm/recipes/RecipeSearchTest.java
parents bc61c5f6 f18e9751
Branches implementing_file_manager
No related tags found
1 merge request!1Merging file manager into main
Hide whitespace changes
Inline Side-by-side
Showing
with 164 additions and 138 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment