projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7117ab4
242cc9a
)
Merge branch '483_blocks_import_export' into 'develop'
author
kaniini
<nenolod@gmail.com>
Sat, 29 Dec 2018 11:34:51 +0000
(11:34 +0000)
committer
kaniini
<nenolod@gmail.com>
Sat, 29 Dec 2018 11:34:51 +0000
(11:34 +0000)
[#483] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
1
2
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/twitter_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/twitter_api/twitter_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge
diff --cc
test/web/twitter_api/twitter_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff