Merge remote-tracking branch 'upstream/develop' into pleroma2
authorMichael <heluecht@pirati.ca>
Thu, 24 Aug 2017 06:26:58 +0000 (06:26 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 24 Aug 2017 06:26:58 +0000 (06:26 +0000)

Trivial merge