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

Browse Source

Conflicts:
	shiai/shiai.2018/anträge/2018-03-03_FrühjahrskrümelrandoriXXII_Breitenbrunn_B.odt
	shiai/shiai.2018/teilnehmer/2018-03-10_StiefelpokalVIII_Döbeln.fods

...

This commit is contained in:

marko

2018-09-15 10:12:27 +02:00

parent e11bab1286 aede174579

commit 785d0f11d9

29 changed files with 18703 additions and 1311 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1604

shiai/shiai.2018/teilnehmer/2018-03-10_StiefelpokalVIII_Döbeln.fods

File diff suppressed because it is too large Load Diff

2492

shiai/shiai.2018/teilnehmer/2018-03-24_BEM_U13_Chemnitz.fods Normal file

File diff suppressed because it is too large Load Diff

2599

shiai/shiai.2018/teilnehmer/2018-04-22_TLOGL-2018-1_HalleSaale.fods Normal file

File diff suppressed because it is too large Load Diff

2626

shiai/shiai.2018/teilnehmer/2018-06-23_TLOGL-2018-2_HalleSaale.fods Normal file

File diff suppressed because it is too large Load Diff

2736

shiai/shiai.2018/teilnehmer/2018-08-18_TLOGL-2018-3_HalleSaale.fods Normal file

File diff suppressed because it is too large Load Diff

2636

shiai/shiai.2018/teilnehmer/2018-08-25_Pokalturnier_U11U13_AdorfV.fods Normal file

File diff suppressed because it is too large Load Diff

2673

shiai/shiai.2018/teilnehmer/2018-09-02_TLOGL-2018-4_HalleSaale.fods Normal file

File diff suppressed because it is too large Load Diff