projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1b1e928
b43d630
)
Merge branch 'features/admin-api-user-views' into 'develop'
author
kaniini
<nenolod@gmail.com>
Mon, 31 Dec 2018 15:49:34 +0000
(15:49 +0000)
committer
kaniini
<nenolod@gmail.com>
Mon, 31 Dec 2018 15:49:34 +0000
(15:49 +0000)
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
1
2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/views/user_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/views/user_view.ex
Simple merge
projects / akkoma / commitdiff