Merge branch 'release' into develop

This commit is contained in:
SabreCat
2017-12-15 05:37:04 +00:00
22 changed files with 473 additions and 311 deletions

View File

@@ -122,6 +122,21 @@ api.bundles = {
type: 'quests',
value: 7,
},
winterQuests: {
key: 'winterQuests',
text: t('winterQuestsText'),
notes: t('winterQuestsNotes'),
bundleKeys: [
'evilsanta',
'evilsanta2',
'penguin',
],
canBuy () {
return moment().isBetween('2017-12-14', '2018-01-01');
},
type: 'quests',
value: 7,
},
};
/*