Merge branch 'master' of linz:/srv/git/lantea
authorRobert Kaiser <kairo@kairo.at>
Mon, 18 Sep 2017 00:56:13 +0000 (02:56 +0200)
committerRobert Kaiser <kairo@kairo.at>
Mon, 18 Sep 2017 00:56:13 +0000 (02:56 +0200)
1  2 
js/ui.js

diff --cc js/ui.js
Simple merge