projects / oweals / peertube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4255d8 73a4872)
Merge branch 'hotfix/docker' into develop
authorChocobozzz <me@florianbigard.com>
Thu, 6 Dec 2018 12:48:46 +0000 (13:48 +0100)
committerChocobozzz <me@florianbigard.com>
Thu, 6 Dec 2018 12:48:46 +0000 (13:48 +0100)

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