Merge branch 'develop' into client-monorepo

2019-10-18 20:26:12 +02:00
parent 94b34f1f80 17b1365853
commit 3e12774e40
17 changed files with 292 additions and 45 deletions
@@ -178,7 +178,6 @@

 <style lang="scss" scoped>
  @import '~@/assets/scss/colors.scss';
-  @import '~@/assets/scss/tiers.scss';

  .header-wrap {
    padding: 0.5em;