Merge branch 'promoInfo'

Browse Source

Conflicts:
	shiai/teilnehmerListe.fods

...

This commit is contained in:

marko

2019-03-23 08:46:56 +01:00

parent d5e73c0b73 e458cd74f5

commit 4bd91a3cd3

246 changed files with 22023 additions and 2204 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

2346

shiai/shiai.2017/teilnehmer/teilnehmerListe.fods

File diff suppressed because it is too large Load Diff