Merge branch 'patch-2' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 12 Jun 2018 12:11:04 +0000 (12:11 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 12 Jun 2018 12:11:04 +0000 (12:11 +0000)
Proposal: Default Avatar Replacement

See merge request pleroma/pleroma!209


Trivial merge