Merge branch 'shiai' of /media/sdb1/gitRepositories/judo into shiai

Conflicts:
	shiai/teilnehmerListe.fods
This commit is contained in:
marko
2019-06-16 16:29:22 +02:00
20 changed files with 7139 additions and 911 deletions