Jonáš Havelka 50ca3ac71f Merge branch 'master' into upgrade_odevzdavatka ... # Conflicts: # data/sitetree.json		2023-06-17 09:25:04 +02:00
..
flat.json	http -> https	2022-12-19 23:04:28 +01:00
fotka_header.json	Oprava URLs v celém gitu	2021-03-09 22:44:42 +01:00
sitetree.json	Merge branch 'master' into upgrade_odevzdavatka	2023-06-17 09:25:04 +02:00