0xb00bface 1f9dcf1ca4 Merge branch 'amatv' into dev ... # Conflicts: # client/src/main/java/ctbrec/ui/SiteUiFactory.java		2021-05-24 16:22:08 +02:00
..
main	Merge branch 'amatv' into dev	2021-05-24 16:22:08 +02:00
test/java/ctbrec	Fix bug in placeholder replacement	2021-05-16 11:29:56 +02:00