Merge branch '483_blocks_import_export' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 29 Dec 2018 11:34:51 +0000 (11:34 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 29 Dec 2018 11:34:51 +0000 (11:34 +0000)
commitdd8f2196f62ab4d4cdec67bdb2b434a317a3f396
treeb6580f30a3ea8b7f41d60201587a5b4722ef96e4
parent7117ab43afc77262efc45363246ee1698ea87641
parent242cc9a6589f54c523284dc2ec18990feb2ca00a
Merge branch '483_blocks_import_export' into 'develop'

[#483] Blocked users list import & export

Closes #483

See merge request pleroma/pleroma!603
lib/pleroma/user.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/twitter_api/twitter_api_controller_test.exs