Merge branch 'develop' into release

2019-11-21 16:17:43 -06:00
parent 99b63456c8 451df7d50d
commit 2362976f14
72 changed files with 1273 additions and 767 deletions
@@ -10,5 +10,5 @@ export default function isFreeRebirth (user) {
    daysFromLastFreeRebirth = 999;
  }

-  return user.stats.lvl >= MAX_LEVEL && daysFromLastFreeRebirth > 45;
+  return user.stats.lvl >= MAX_LEVEL && daysFromLastFreeRebirth >= 45;
 }