projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f89fe3a
472e7b7
)
Merge branch 'develop' into feature/return-link-for-password-reset
author
Maxim Filippov
<colixer@gmail.com>
Sun, 22 Sep 2019 13:58:39 +0000
(16:58 +0300)
committer
Maxim Filippov
<colixer@gmail.com>
Sun, 22 Sep 2019 13:58:39 +0000
(16:58 +0300)
1
2
CHANGELOG.md
patch
|
diff1
|
diff2
|
blob
|
history
docs/api/admin_api.md
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/admin_api/admin_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/admin_api/admin_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CHANGELOG.md
Simple merge
diff --cc
docs/api/admin_api.md
Simple merge
diff --cc
lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge
diff --cc
test/web/admin_api/admin_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff