Matěj Kocián 181e9b74e1 Merge branch 'Petr' ... Conflicts: seminar/templates/seminar/zadani/AktualniZadani.html seminar/views.py		2015-09-07 11:00:48 +02:00
..
seminar	Merge branch 'Petr'	2015-09-07 11:00:48 +02:00