projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e19e829
a0c65bb
)
Merge branch 'remove-avatar-header' into 'develop'
author
kaniini
<nenolod@gmail.com>
Tue, 9 Jul 2019 17:51:41 +0000
(17:51 +0000)
committer
kaniini
<nenolod@gmail.com>
Tue, 9 Jul 2019 17:51:41 +0000
(17:51 +0000)
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
1
2
CHANGELOG.md
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/mastodon_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CHANGELOG.md
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge