Merge branch 'refs/heads/dev' into df/#856-tap-water

# Conflicts: # CHANGELOG.md
ie3-institute · Aug 19, 2024 · 10a78b1 · 10a78b1
2 parents b48e805 + b7d0dd4
commit 10a78b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -64,3 +64,5 @@ Scala and uses pekko as its main library for concurrent calculation and to repre
 - Bung, Vicky
 - Hütte, Simon
 - Schmelter, Philipp
+- Petersmeier, Pierre
+- Heintze, Marvin
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -74,6 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Convert all `eval-rst` instances in rtd to myst syntax [#901](https://github.com/ie3-institute/simona/issues/901)
 - External simulation should provide information about next tick of MobSim [#776](https://github.com/ie3-institute/simona/issues/776)
 - Updated AUTHORS.md [#904](https://github.com/ie3-institute/simona/issues/904)
+- Updated AUTHORS.md [#905](https://github.com/ie3-institute/simona/issues/905)
 - Prepare ThermalStorageTestData for Storage without storageVolumeLvlMin [#894](https://github.com/ie3-institute/simona/issues/894)
 
 ### Fixed