git.immae.eu Git - github/Chocobozzz/PeerTube.git/commit - server/tests/api/moderation/abuses.ts

]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commit - server/tests/api/moderation/abuses.ts

projects / github / Chocobozzz / PeerTube.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 677ea3c 2170f1d)

author	Chocobozzz <me@florianbigard.com>
	Mon, 20 Jul 2020 15:00:58 +0000 (17:00 +0200)
committer	Chocobozzz <me@florianbigard.com>
	Mon, 20 Jul 2020 15:00:58 +0000 (17:00 +0200)
commit	ec903c010ecc54ec2acad0bf2cf10e7fbf6a0fa2
tree	255a1f176f5f18a9205d2c7c8ce5f562f0e5ab31	tree \| snapshot
parent	677ea3c084508a1c3949b9f4b3da3c21bac8ff52	commit \| diff
parent	2170f1db6ee40531f9d08b711d8b7b00254c0031	commit \| diff

Merge branch 'release/2.3.0' into develop

client/src/app/+admin/users/user-edit/user-edit.component.html	diff1 \|	diff2 \|	blob \| history
server/lib/emailer.ts	diff1 \|	diff2 \|	blob \| history
server/lib/user.ts	diff1 \|	diff2 \|	blob \| history

ActivityPub-federated video streaming platform using P2P directly in your web browser