Merge branch 'users' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Fri, 8 Jun 2018 11:10:10 +0000 (11:10 +0000)
committerlambda <pleromagit@rogerbraun.net>
Fri, 8 Jun 2018 11:10:10 +0000 (11:10 +0000)
commit45a935f0bd86501d64be7f453c08a47e46565ef9
treeabfa2022ddb53c8d006c3b3225a7f2d07a5326c6
parentbb639a362e42cba5a78e64e4c7fc0380fe25c414
parentfa0c2727d86f63136b88d65e3bb876dd17f316aa
Merge branch 'users' into 'develop'

Fix users lookup/return type

See merge request pleroma/pleroma!201