projects / oweals / peertube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 891bc4f 1cf8aca)
Merge branch 'master' into develop
authorChocobozzz <me@florianbigard.com>
Tue, 13 Nov 2018 14:32:12 +0000 (15:32 +0100)
committerChocobozzz <me@florianbigard.com>
Tue, 13 Nov 2018 14:32:12 +0000 (15:32 +0100)

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