projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bdc7b60
31fef95
)
Merge branch 'features/favicons' into 'develop'
author
lain
<lain@soykaf.club>
Thu, 9 Jul 2020 13:09:31 +0000
(13:09 +0000)
committer
lain
<lain@soykaf.club>
Thu, 9 Jul 2020 13:09:31 +0000
(13:09 +0000)
Add support for remote favicons
See merge request pleroma/pleroma!2261
1
2
config/description.exs
patch
|
diff1
|
diff2
|
blob
|
history
docs/configuration/cheatsheet.md
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/views/account_view_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
config/description.exs
Simple merge
diff --cc
docs/configuration/cheatsheet.md
Simple merge
diff --cc
test/web/mastodon_api/views/account_view_test.exs
Simple merge