projects / oweals / peertube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3117f1 a6375e6)
Merge branch 'webseed'
authorChocobozzz <florian.bigard@gmail.com>
Fri, 7 Oct 2016 08:10:00 +0000 (10:10 +0200)
committerChocobozzz <florian.bigard@gmail.com>
Fri, 7 Oct 2016 08:10:00 +0000 (10:10 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.