Skip to content
Snippets Groups Projects
Commit aa7a46bf authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into remove-todo-use-new-statistic-dsl

# Conflicts:
#	alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticService.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangCountTestFactory.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticServiceTest.java
parents f4cde971 8fd3652a
No related branches found
No related tags found
Loading
Showing
with 293 additions and 60 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment