Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/resources/application.properties
10 months ago · 61ab854441
7 changed files with 0 additions and 0 deletions
--- a/.gradle/6.3/executionHistory/executionHistory.bin
+++ b/.gradle/6.3/executionHistory/executionHistory.bin
--- a/.gradle/6.3/executionHistory/executionHistory.lock
+++ b/.gradle/6.3/executionHistory/executionHistory.lock
--- a/.gradle/6.3/fileHashes/fileHashes.bin
+++ b/.gradle/6.3/fileHashes/fileHashes.bin
--- a/.gradle/6.3/fileHashes/fileHashes.lock
+++ b/.gradle/6.3/fileHashes/fileHashes.lock
--- a/.gradle/6.3/fileHashes/resourceHashesCache.bin
+++ b/.gradle/6.3/fileHashes/resourceHashesCache.bin
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/.gradle/buildOutputCleanup/outputFiles.bin