tree e239244d4dca5993370216f995dbff432ff6e4bb
parent fa82b80c9bce223af71e57151ab62b18bf005064
parent 486afbc08d4689105019f77bf1ca0d1a2fc5ab0f
author Thomas Wolf <thomas.wolf@paranor.ch> 1641390879 +0100
committer Thomas Wolf <thomas.wolf@paranor.ch> 1641394749 +0100

Merge branch 'stable-5.13' into stable-6.0

* stable-5.13:
  Use slf4j-simple instead of log4j for logging
  Update orbit to R20211213173813

Change-Id: I219ef3901c1d908b91bf9c8f00431b22686ff7a5
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>