projects / oweals / peertube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f06c4d 16ec5e0)
Merge branch 'master' into develop
authorChocobozzz <me@florianbigard.com>
Mon, 11 May 2020 09:09:45 +0000 (11:09 +0200)
committerChocobozzz <me@florianbigard.com>
Mon, 11 May 2020 09:09:45 +0000 (11:09 +0200)

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