Ivan Hörler a22d0fb7bd Merge branch 'master' of git.2li.ch:ibz/web_AI-5 ... * 'master' of git.2li.ch:ibz/web_AI-5: some fixes # Conflicts: # presentation/presentation.html		2018-03-15 08:11:12 +01:00
..
pictures	add form sample	2018-03-14 15:55:11 +01:00
presentation.html	add of Fazit	2018-03-15 08:09:09 +01:00
presentation.org	Merge branch 'master' of git.2li.ch:ibz/web_AI-5	2018-03-15 08:11:12 +01:00