Merge branch 'release' into develop

2019-01-31 17:12:21 -06:00
parent ed8bd84257 94b5ed9dab
commit c1cad5c0a9
29 changed files with 2295 additions and 2156 deletions
@@ -13,7 +13,7 @@ import forEach from 'lodash/forEach';
 import moment from 'moment';

 describe('shared.ops.purchase', () => {
-  const SEASONAL_FOOD = 'Meat';
+  const SEASONAL_FOOD = 'Cake_Base';
  let user;
  let goldPoints = 40;
  let analytics = {track () {}};