Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit ad2eb3a

Browse files
lgallgal
lgal
authored and
lgal
committed
Merge remote-tracking branch 'remotes/origin/development' into 2950_export-address-community
# Conflicts: # sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java # sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactExportDto.java # sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseJoins.java # sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactJoins.java
2 parents cba1e0a + c79e8b9 commit ad2eb3a

91 files changed

Lines changed: 2100 additions & 954 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ deploy
2323
/sormas-app/java_pid21052.hprof
2424
bin
2525
/sormas-base/setup/setup.log
26+
27+
# Exclude maven wrapper
28+
!/.mvn/wrapper/maven-wrapper.jar
29+
2630
/sormas-cargoserver/.env
2731
/sormas-cargoserver/custom.env
2832
/sormas-cargoserver/custom.properties

‎.mvn/wrapper/maven-wrapper.jar‎

49.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

‎mvnw‎

Lines changed: 310 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)