projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a6d4cc8
046741c
)
Merge branch 'feature/peertube_2' into 'develop'
author
kaniini
<nenolod@gmail.com>
Tue, 21 Aug 2018 16:58:44 +0000
(16:58 +0000)
committer
kaniini
<nenolod@gmail.com>
Tue, 21 Aug 2018 16:58:44 +0000
(16:58 +0000)
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
Trivial merge