Skip to content

Feature/58 final delivery updated database #62

Merged
merged 34 commits into from
Apr 12, 2026

Conversation

apbaluna
Copy link
Collaborator

No description provided.

AdrianBalunan added 30 commits April 2, 2026 11:52
…sn't work until user is implemented. On hold.
…ty and such, and added new contructur to make previous messages.
@apbaluna apbaluna self-assigned this Apr 12, 2026
…nto feature/58-final-delivery-updated-database

# Conflicts:
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseManager.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java
#	helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/DatabaseManagerTest.java
@apbaluna apbaluna merged commit 09fcd3f into develop Apr 12, 2026
1 check failed
@apbaluna apbaluna deleted the feature/58-final-delivery-updated-database branch April 13, 2026 11:11
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant