Merge branch 'develop' of git.ntnu.no:cathrkri/systemutviklingTeam6 i…

…nto hotfix/63-hotfix-database-and-api-correction # Conflicts: # helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/scraper/scraperComponents/URLCharityScraperTest.java
cathrkri · Apr 14, 2026 · 0b42690 · 0b42690
1 parent 2c7ba8a
commit 0b42690
Show file tree

Hide file tree

Showing 7 changed files with 2,111 additions and 294 deletions.
diff --git a/docs/Møtedokumenter/Thursdays Meeting 2026.04.09 (With LA).pdf b/docs/Møtedokumenter/Thursdays Meeting 2026.04.09 (With LA).pdf
diff --git a/helpmehelpapplication/src/main/resources/fxml/availableOrganization.fxml b/helpmehelpapplication/src/main/resources/fxml/availableOrganization.fxml