Merge branch 'web' into owm
authorgregor herrmann <gregor@toastfreeware.priv.at>
Sun, 10 Jun 2018 00:10:23 +0000 (02:10 +0200)
committergregor herrmann <gregor@toastfreeware.priv.at>
Sun, 10 Jun 2018 00:10:23 +0000 (02:10 +0200)
commit3dc2b087a5e3cb7952392cb00a4469508af6e019
tree2af7383c43868aa0ed0e4c6cece51891ea83cb4b
parente4f2c3354b555c39305f4d91c3be50f875e7ed72
parent1a964fcfe4389d76fc8bff945d0f8069e6826487
Merge branch 'web' into owm