projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7c1d804
6519f59
)
Merge branch 'v2-suggestions' into 'develop'
author
Alex Gleason
<alex@alexgleason.me>
Sun, 19 Dec 2021 17:31:17 +0000
(17:31 +0000)
committer
Alex Gleason
<alex@alexgleason.me>
Sun, 19 Dec 2021 17:31:17 +0000
(17:31 +0000)
V2 suggestions
See merge request pleroma/pleroma!3547
1
2
docs/development/API/admin_api.md
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/moderation_log.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/views/instance_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/pleroma/user_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
docs/development/API/admin_api.md
Simple merge
diff --cc
lib/pleroma/moderation_log.ex
Simple merge
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/views/instance_view.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
test/pleroma/user_test.exs
Simple merge