Merge branch 'develop' into spring

Browse Source

# Conflicts:
#	core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategoryRepo.java
#	core/src/main/java/se/su/dsv/scipro/checklist/ChecklistQuestionRepo.java
#	core/src/main/java/se/su/dsv/scipro/file/FileDescriptionRepo.java
#	core/src/main/java/se/su/dsv/scipro/file/ProjectFileServiceImpl.java
#	core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepo.java
#	core/src/main/java/se/su/dsv/scipro/forum/ForumPostReadStateRepository.java
#	core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepository.java
#	core/src/main/java/se/su/dsv/scipro/forum/GroupThreadRepository.java
#	core/src/main/java/se/su/dsv/scipro/forum/ProjectThreadRepository.java
#	core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepository.java
#	core/src/main/java/se/su/dsv/scipro/match/FirstMeetingRepository.java
#	core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepository.java
#	core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImpl.java
#	core/src/main/java/se/su/dsv/scipro/peer/CommentThreadRepo.java
#	core/src/main/java/se/su/dsv/scipro/peer/PeerRequestRepository.java
#	core/src/main/java/se/su/dsv/scipro/project/ProjectRepo.java
#	core/src/main/java/se/su/dsv/scipro/system/FooterAddressRepo.java
#	core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepo.java
#	core/src/main/java/se/su/dsv/scipro/system/PasswordRepo.java
#	core/src/main/java/se/su/dsv/scipro/system/UserRepo.java

...

This commit is contained in:

Andreas Svanberg 2024-10-28 14:05:14 +01:00

parent 612f5c33ac d8e4f0dd22

commit c7a213baca

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available