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

Merge remote-tracking branch 'origin/OZG-7037-Vorgang-an-DMS' into OZG-7038-EvaluationDMSQuittung

# Conflicts:
#	archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/ArchiveManagerCommand.java
#	archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandRemoteService.java
#	archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandService.java
#	archive-manager-server/src/main/java/de/ozgcloud/archive/historie/AktenzeichenChangeHistoryBuilder.java
#	archive-manager-server/src/main/java/de/ozgcloud/archive/historie/AssignedUserChangeHistoryBuilder.java
#	archive-manager-server/src/main/java/de/ozgcloud/archive/historie/ChangeHistoryBuilder.java
#	archive-manager-server/src/test/java/de/ozgcloud/archive/ArchiveManagerTestApplication.java
#	archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java
parents 3ff85760 78fd1324
No related branches found
No related tags found
Loading
Showing
with 380 additions and 270 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment