Merge branch 'release/2.1.0' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 26 Feb 2020 14:26:02 +0000 (15:26 +0100)
committerChocobozzz <me@florianbigard.com>
Wed, 26 Feb 2020 14:26:02 +0000 (15:26 +0100)
commit818c449b3c34e9f324ac744120c8774e724ab25e
treeca470149152d49ee3a40b46f779fd01008e7a9c3
parent4832e41584044cdc6c4ef9852d458031326b164d
parentc002261381a4dd0b07dd6706942d446b237fd8f4
Merge branch 'release/2.1.0' into develop
client/src/app/menu/menu.component.scss
client/src/standalone/videos/embed.ts