Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/logback.xml
This commit is contained in:
Szakalakamaka
2020-09-09 11:06:39 +02:00

View File

@@ -1,2 +1,2 @@
redis.host = localhost
redis.port = 6379
redis.host = redis-server
redis.port = 6379