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

Browse Source

Conflicts:
	shiai/teilnehmerListe.fods

...

This commit is contained in:

marko

2019-06-16 16:29:22 +02:00

parent 90f0f19ed5 db5510085f

commit ec91d92d89

20 changed files with 7139 additions and 911 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

2972

shiai/shiai.2019/2019-06-29--30-Ljs/2019-06-29-Ljs-U12-teilnehmerListe.fods Normal file

File diff suppressed because one or more lines are too long

2972

shiai/shiai.2019/2019-06-29--30-Ljs/2019-06-30-Ljs-U14-teilnehmerListe.fods Normal file

File diff suppressed because one or more lines are too long