Merge branch 'release/1.4.0' into develop
authorChocobozzz <me@florianbigard.com>
Thu, 5 Sep 2019 08:19:35 +0000 (10:19 +0200)
committerChocobozzz <me@florianbigard.com>
Thu, 5 Sep 2019 08:19:35 +0000 (10:19 +0200)
commit00aab0666c6f772548c160fdfa871a8843b88f37
tree73958f6f5d41371980f9653c8cb0ed8f46683c5a
parentbe04c6fdab5d91a7a57fa3ff36cde22a549c29da
parent951532924c1b3fd547cbf45f0c9cf9734203d6b4
Merge branch 'release/1.4.0' into develop
client/src/app/+signup/+register/register.component.html
server/lib/schedulers/videos-redundancy-scheduler.ts
server/models/video/video-blacklist.ts