projects / oweals / peertube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0c0c0a 2ef1d2b)
Merge branch 'weblate' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 13 Nov 2019 09:05:27 +0000 (10:05 +0100)
committerChocobozzz <me@florianbigard.com>
Wed, 13 Nov 2019 09:05:27 +0000 (10:05 +0100)
1  2 
client/package.json patch | diff1 | diff2 | blob | history

diff --cc client/package.json
Simple merge
Unnamed repository; edit this file 'description' to name the repository.