Merge remote-tracking branch 'rma-rripken/feature/cto-137-project-sub… · rma-rripken/cwms-data-api@5912c77 · GitHub

Commit

Merge remote-tracking branch 'rma-rripken/feature/cto-137-project-sub…

Browse files

…-location' into feature/cto-137-project-sub-location

# Conflicts:
#	cwms-data-api/src/main/java/cwms/cda/api/Controllers.java
#	cwms-data-api/src/main/java/cwms/cda/data/dto/project/ProjectChildLocations.java

Loading branch information

rma-rripken committed Jul 25, 2024

2 parents 136e14a + 0bb9863 commit 5912c77