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)
commit958cf5da946d6134f46eabd84aaa5abd37f88d2f
tree0da9c618150519a66d3f14cbc20a2b37c757a102
parent3f42806b1b8f0a2c27dda4821ab61c92b9a4652f
parent991b8a6b9d0c6bceadd31a39e5765d2368d1bcf9
Merge branch 'patch-2' into 'develop'

Proposal: Default Avatar Replacement

See merge request pleroma/pleroma!209