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)
commit22ca1d1dfee4ea8624222560f1008ea84879f94a
treed229c4bdca2bd3baa04871feee9d72636a9e0a6b
parent76a13bc5a203970c36cace0791b4855c5613b91e
parentcb2bdd5c071e5823e408bedeb3b9183893ad8cd1
Merge branch 'feature/order-users-by-nickname-admin-api' of git.pleroma.social:maxf/pleroma into feature/order-users-by-nickname-admin-api