projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
380e9fb
b640cf0
)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned...
author
Egor Kislitsyn
<egor@kislitsyn.com>
Mon, 7 Jan 2019 13:55:32 +0000
(20:55 +0700)
committer
Egor Kislitsyn
<egor@kislitsyn.com>
Mon, 7 Jan 2019 13:55:32 +0000
(20:55 +0700)
1
2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/mastodon_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff