projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9b9d67b
d63dca8
)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
author
lain
<lain@soykaf.club>
Fri, 20 Mar 2020 13:52:58 +0000
(14:52 +0100)
committer
lain
<lain@soykaf.club>
Fri, 20 Mar 2020 13:52:58 +0000
(14:52 +0100)
1
2
test/notification_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/controllers/notification_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/views/notification_view_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
test/notification_test.exs
Simple merge
diff --cc
test/web/activity_pub/activity_pub_test.exs
Simple merge
diff --cc
test/web/mastodon_api/controllers/notification_controller_test.exs
Simple merge
diff --cc
test/web/mastodon_api/views/notification_view_test.exs
Simple merge
projects / akkoma / commitdiff