Jonas Havelka 796e32db7f Merge branch 'data_migrations' into vzhled ... # Conflicts: # seminar/templates/seminar/cojemam/base.html # seminar/templates/seminar/soustredeni/seznam_soustredeni.html		2020-09-20 12:50:47 +02:00
..
seminar	Merge branch 'data_migrations' into vzhled	2020-09-20 12:50:47 +02:00