projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
305d219
)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
author
Egor Kislitsyn
<egor@kislitsyn.com>
Mon, 11 Feb 2019 06:54:21 +0000
(13:54 +0700)
committer
Egor Kislitsyn
<egor@kislitsyn.com>
Mon, 11 Feb 2019 06:54:21 +0000
(13:54 +0700)
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
No differences found
projects / akkoma / commitdiff