From: gregor herrmann <gregor@toastfreeware.priv.at>
Date: Sun, 10 Jun 2018 00:10:23 +0000 (+0200)
Subject: Merge branch 'web' into owm
X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/commitdiff_plain/3dc2b087a5e3cb7952392cb00a4469508af6e019?hp=3dc2b087a5e3cb7952392cb00a4469508af6e019;ds=sidebyside

Merge branch 'web' into owm
---