Merge branch 'generation_tsl_ats' of github.com:markusweigelt/kitodo-… · kitodo/kitodo-production@d654a52 · GitHub

Commit

Merge branch 'generation_tsl_ats' of github.com:markusweigelt/kitodo-…

Browse files

…production into generation_tsl_ats

# Conflicts:
#	Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessDataTab.java
#	Kitodo/src/main/java/org/kitodo/production/process/TitleGenerator.java
#	Kitodo/src/main/java/org/kitodo/production/services/data/ProcessService.java

Loading branch information

markusweigelt committed Sep 23, 2021

2 parents 56363c4 + c4199cc commit d654a52