projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
954acdd
b9e6ad5
)
Merge branch 'develop' into activation-meta
author
Mark Felder
<feld@FreeBSD.org>
Tue, 30 Jun 2020 20:09:03 +0000
(15:09 -0500)
committer
Mark Felder
<feld@FreeBSD.org>
Tue, 30 Jun 2020 20:09:03 +0000
(15:09 -0500)
1
2
lib/pleroma/web/mastodon_api/views/instance_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/views/instance_view.ex
Simple merge