Commit aa4378fa authored by tomas's avatar tomas
Browse files

Merge branch 'api,db' into feature/frontend 

# Conflicts:
#	app/src/main/java/cz/muni/fi/pv239/nomnom/ui/screens/RecipeDetailScreen.kt
#	app/src/main/java/cz/muni/fi/pv239/nomnom/view_model/RecipesViewModel.kt
parents d9b80c05 6a64dea6
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment