From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 11 Sep 2017 18:54:44 +0000 (+0200)
Subject: Merge branch 'develop' into oauth2
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=f0d41a3abf3e584c90c96644f73d533ea0680237;hp=--cc;p=akkoma

Merge branch 'develop' into oauth2
---

f0d41a3abf3e584c90c96644f73d533ea0680237