Merge branch 'master' of linz:/srv/git/slides
authorRobert Kaiser <kairo@kairo.at>
Thu, 26 Sep 2019 16:49:06 +0000 (18:49 +0200)
committerRobert Kaiser <kairo@kairo.at>
Thu, 26 Sep 2019 16:49:06 +0000 (18:49 +0200)
1  2 
index.html

diff --cc index.html
Simple merge