Merge branch 'master' into feature/15-archive-view-url

Fin Reinhard

22.51.2019 1c087fae322a1b07bb7bd554ee10ff473c47c727

 borgbutler-server/src/main/resources/log4j.properties

@@ -14,7 +14,7 @@

log4j.appender.file=org.apache.log4j.RollingFileAppender

log4j.appender.file.File=merlin.log
log4j.appender.file.File=borgbutler.log
log4j.appender.file.MaxFileSize=10MB
log4j.appender.file.MaxBackupIndex=5
log4j.appender.file.layout=org.apache.log4j.PatternLayout