Merge branch 'web'
authorgregor herrmann <gregor@toastfreeware.priv.at>
Thu, 22 Nov 2018 23:34:23 +0000 (00:34 +0100)
committergregor herrmann <gregor@toastfreeware.priv.at>
Thu, 22 Nov 2018 23:34:23 +0000 (00:34 +0100)
commitc41b39636626c0fd80c06cec0508458c25b23873
treec671111f55904b3f4f5ffd9d12d4cc3c3600ee07
parent7bc31204e1355e06fc8be3c28563bb0c1c4441f7
parent38730e4b9fe34e1496fa06e2f80dd9b7fc5fdbd8
Merge branch 'web'