Merge branch 'release/2.1.0' into develop
authorChocobozzz <me@florianbigard.com>
Thu, 20 Feb 2020 09:43:33 +0000 (10:43 +0100)
committerChocobozzz <me@florianbigard.com>
Thu, 20 Feb 2020 09:43:33 +0000 (10:43 +0100)
commit4c1def5fd8e9f483238eb38e221f555e2e6bbf07
tree01c5c8e3e5130fac8493ae39fe0af8a16d85a266
parent80adb0366f0c2efabfd554009239f406983c1e15
parentc06be129506de9ac8d9910fed473c86724ca0e4e
Merge branch 'release/2.1.0' into develop
client/src/app/menu/menu.component.scss
server/controllers/client.ts