Merge branch 'api-v3' into api-v3-groups

2016-01-02 22:29:59 -06:00
parent a775c992ab 37916271e8
commit 76c97dfa6e
32 changed files with 697 additions and 868 deletions
@@ -445,7 +445,7 @@ let head = {
    canOwn: ownsItem('head_special_fireCoralCirclet'),
  },
  nye: {
-    event: EVENTS.winter,
+    event: EVENTS.winter2016,
    text: t('headSpecialNyeText'),
    notes: t('headSpecialNyeNotes'),
    value: 0,