chore: merge dev branch and resolve conflicts

RRZE-Webteam · Sep 4, 2024 · 7a246d5 · 7a246d5
2 parents 538b0f5 + 4f793bc
commit 7a246d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- `date` and `modified` degree program REST API properties.
+- `fau/v1/degree-program/index` REST API endpoint.
+
 ### Changed
 
 - Removed campo keys from degree program revision data.

diff --git a/composer.lock b/composer.lock