From: Roger Braun Date: Thu, 20 Apr 2017 08:16:41 +0000 (+0200) Subject: Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5e7ceeba94c179b5ffe98d1bb1115a2e0af196e2;p=akkoma Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus --- 5e7ceeba94c179b5ffe98d1bb1115a2e0af196e2