projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0bd2b85
3ae448b
)
Merge branch 'develop' into refactor/subscription
author
Roman Chvanikov
<chvanikoff@pm.me>
Sat, 14 Sep 2019 15:29:51 +0000
(18:29 +0300)
committer
Roman Chvanikov
<chvanikoff@pm.me>
Sat, 14 Sep 2019 15:29:51 +0000
(18:29 +0300)
1
2
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/pleroma_api/pleroma_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/controllers/mastodon_api_controller.ex
Simple merge
diff --cc
lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
Simple merge
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff