Merge tag '1_9_0' into develop
# Conflicts: # OMDSServiceDefinition/doc/ON_2 Antragsabwicklung/ON_2.01_Deep-Link-Angebot-Antrag/ON_2.01.2_Qualifizierte-Deep-Links.docx
This commit is contained in:
7
.idea/encodings.xml
generated
Normal file
7
.idea/encodings.xml
generated
Normal file
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding">
|
||||
<file url="file://$PROJECT_DIR$/OMDSServiceDefinition/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/OMDSServiceDefinition/src/main/resources" charset="UTF-8" />
|
||||
</component>
|
||||
</project>
|
||||
Reference in New Issue
Block a user