Skip to content

Updates#33

Merged
Vooidss merged 33 commits intofavoritesfrom
main
May 19, 2025
Merged

Updates#33
Vooidss merged 33 commits intofavoritesfrom
main

Conversation

@Vooidss
Copy link
Member

@Vooidss Vooidss commented May 19, 2025

No description provided.

Vooidss and others added 30 commits May 9, 2025 13:18
# Conflicts:
#	app/src/main/java/com/example/projectfigma/Entites/Dishes.kt
This reverts commit bb50d34, reversing
changes made to fd3f106.

zx5
Merge pull request #26 from VectorVanguard/main
# Conflicts:
#	app/src/main/java/com/example/projectfigma/DAO/DishesDao.kt
@Vooidss Vooidss merged commit 56793d0 into favorites May 19, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants