Ivan Hörler 15b5f7304d Merge branch 'master' of git.2li.ch:ibz/web_AI-5 ... * 'master' of git.2li.ch:ibz/web_AI-5: some minor changes # Conflicts: # presentation/presentation.html		2018-03-16 11:21:50 +01:00
..
pictures	add form sample	2018-03-14 15:55:11 +01:00
presentation.org	Merge branch 'master' of git.2li.ch:ibz/web_AI-5	2018-03-16 11:21:50 +01:00