Skip to content
Snippets Groups Projects
Commit 01990986 authored by HSoreide's avatar HSoreide
Browse files

Merge remote-tracking branch 'origin/HS_Add_basic_styling_by_CSS' into HS_Add_basic_styling_by_CSS

# Conflicts:
#	src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java
#	src/main/java/no/ntnu/idatt1002/demo/controller/AllRecipesController.java
#	src/main/java/no/ntnu/idatt1002/demo/controller/IngredientTileController.java
#	src/main/resources/recipes/Fridge.register
#	src/main/resources/style.css
#	src/main/resources/view/IngredientTile.fxml
#	src/main/resources/view/Recipe.fxml
parents 3694d00a caa971c9
No related branches found
No related tags found
Loading
Checking pipeline status
Showing
No files found.
with 0 additions and 0 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 to comment