projects / oweals / peertube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d52b30 5954943)
Merge branch 'release/beta-10' into develop
authorChocobozzz <me@florianbigard.com>
Tue, 7 Aug 2018 14:12:31 +0000 (16:12 +0200)
committerChocobozzz <me@florianbigard.com>
Tue, 7 Aug 2018 14:12:31 +0000 (16:12 +0200)
1  2 
client/package.json patch | diff1 | diff2 | blob | history
package.json patch | diff1 | diff2 | blob | history

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