Merge branch 'feature/user-configurable-mascot' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 20 May 2019 18:17:42 +0000 (18:17 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 20 May 2019 18:17:42 +0000 (18:17 +0000)
commit943d1b2f269eaa1fc29702fed45eb8a11164598b
tree987eb9e5a5c85796de422dce0335ddf3aede256f
parent643b56347879698a60c206ffb6f4e1e70011c552
parentdaeae8e2e7c506b72c66dea6ac790408f948ec16
Merge branch 'feature/user-configurable-mascot' into 'develop'

Feature: user configurable mascot

See merge request pleroma/pleroma!1177