projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
494bb6b
29dd8ab
)
Merge branch 'develop' into tests/mastodon_api_controller.ex
author
Maksim Pechnikov
<parallel588@gmail.com>
Tue, 24 Sep 2019 05:06:04 +0000
(08:06 +0300)
committer
Maksim Pechnikov
<parallel588@gmail.com>
Tue, 24 Sep 2019 05:06:04 +0000
(08:06 +0300)
1
2
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/controllers/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/user.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
Simple merge
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff