Merge branch 'master' of linz:/srv/git/lantea
authorRobert Kaiser <kairo@kairo.at>
Mon, 20 Nov 2017 18:26:17 +0000 (19:26 +0100)
committerRobert Kaiser <kairo@kairo.at>
Mon, 20 Nov 2017 18:26:17 +0000 (19:26 +0100)
1  2 
js/ui.js

diff --cc js/ui.js
Simple merge