Merge branch 'master' of linz:/srv/git/slides
authorRobert Kaiser <kairo@kairo.at>
Fri, 1 Feb 2019 00:16:31 +0000 (01:16 +0100)
committerRobert Kaiser <kairo@kairo.at>
Fri, 1 Feb 2019 00:16:31 +0000 (01:16 +0100)
1  2 
dachfest2018/slides.js

Simple merge