projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bd40880
14ebf8f
)
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
author
Ivan Tashkinov
<ivantashkinov@gmail.com>
Sat, 14 Mar 2020 12:37:02 +0000
(15:37 +0300)
committer
Ivan Tashkinov
<ivantashkinov@gmail.com>
Sat, 14 Mar 2020 12:37:02 +0000
(15:37 +0300)
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
Trivial merge
projects / akkoma / commitdiff