Merge branch 'reserve-user-names' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 27 Dec 2018 19:35:06 +0000 (19:35 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 27 Dec 2018 19:35:06 +0000 (19:35 +0000)
commitcff0292d4b32cf51de8ad15281c35d783b137dd2
treecbe9546e4f4aa76165818157b688d25e66bae66a
parent02866a42afde69f40724648757f6bdaab5a66d17
parent1dd71026a1acd29e560f059d36f37ea70001bedb
Merge branch 'reserve-user-names' into 'develop'

Reserve a few user names

See merge request pleroma/pleroma!594