projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d797b9
e849343
)
Merge branch 'stable' into 'develop'
author
rinpatch
<rinpatch@sdf.org>
Sun, 8 Mar 2020 13:42:15 +0000
(13:42 +0000)
committer
rinpatch
<rinpatch@sdf.org>
Sun, 8 Mar 2020 13:42:15 +0000
(13:42 +0000)
Sync develop with stable
Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606
See merge request pleroma/pleroma!2278
Trivial merge