Merge branch 'release' into develop

2018-01-17 18:24:48 +00:00
parent c3220e7c03 07ed989862
commit d34beca3cc
28 changed files with 110 additions and 105 deletions
@@ -479,8 +479,8 @@ export default {
          categories.push({
            identifier: 'cards',
            text: this.$t('cards'),
-            items: _map(_filter(this.content.cardTypes, (value, key) => {
-              return value.yearRound || key === 'nye';
+            items: _map(_filter(this.content.cardTypes, (value) => {
+              return value.yearRound;
            }), (value) => {
              return {
                ...getItemInfo(this.user, 'card', value),