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

Conflicts:
	homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate.bak
	shiai/shiai.2018/anträge/2018-08-25_Pokalturnier_U11U13_AdorfV_A.odt
	shiai/shiai.2018/anträge/2018-09-22_Drachencup_Gera_B.odt
This commit is contained in:
marko
2018-11-21 10:55:06 +01:00
33 changed files with 19742 additions and 0 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

2287
shiai/teilnehmerListe.fods Normal file

File diff suppressed because it is too large Load Diff