projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d211342
4fbdd1c
)
Merge remote-tracking branch 'origin/develop' into feature/account-export
author
Egor Kislitsyn
<egor@kislitsyn.com>
Fri, 30 Oct 2020 20:17:33 +0000
(
00:17
+0400)
committer
Egor Kislitsyn
<egor@kislitsyn.com>
Fri, 30 Oct 2020 20:17:33 +0000
(
00:17
+0400)
1
2
test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff