projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8143251
84d84e4
)
Merge branch 'fix/sign-in-with-toot' into 'develop'
author
Haelwenn
<git.pleroma.social@hacktivis.me>
Wed, 5 Sep 2018 18:20:26 +0000
(18:20 +0000)
committer
Haelwenn
<git.pleroma.social@hacktivis.me>
Wed, 5 Sep 2018 18:20:26 +0000
(18:20 +0000)
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
1
2
lib/pleroma/web/mastodon_api/views/account_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/account_view_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/views/account_view.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
test/web/mastodon_api/account_view_test.exs
Simple merge
projects / akkoma / commitdiff