Merge branch 'feature/order-users-by-nickname-admin-api' of git.pleroma.social:maxf...
authorMaxim Filippov <colixer@gmail.com>
Sun, 17 Mar 2019 10:30:05 +0000 (13:30 +0300)
committerMaxim Filippov <colixer@gmail.com>
Sun, 17 Mar 2019 10:30:05 +0000 (13:30 +0300)

Trivial merge