Merge branch 'master' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 15 May 2019 13:32:25 +0000 (15:32 +0200)
committerChocobozzz <me@florianbigard.com>
Wed, 15 May 2019 13:32:25 +0000 (15:32 +0200)
commit97567dd81f508dd6295ac4d73d849aa2ce0a6549
treeb69b624cbdcb0d1d6c35ecd6d1005284d7b42b3b
parent56ba489f67474b176ddbba2f5f6247df583c868a
parent98d33a03d3a86aad709e2cd39a4e4d8bac6b7664
Merge branch 'master' into develop
client/src/app/menu/menu.component.scss