Develop > Master #18

codeBelt · 2018-03-12T06:16:41Z

No description provided.

* swap postcss w/ sass * yarn * rename screen.css to screen.scss * cleanup

* update hapi to version 17 * get server side rendering working with hapi 17 * change to sagaDone

# Conflicts: # package.json # yarn.lock

ccheney and others added 10 commits March 11, 2018 16:36

Sass (#16)

9a280fc

* swap postcss w/ sass * yarn * rename screen.css to screen.scss * cleanup

Hapi 17 (#17)

267df04

* update hapi to version 17 * get server side rendering working with hapi 17 * change to sagaDone

update react and webpack

6267f2e

update other packages

873e329

update bootstrap

6fd48f2

fix prod build issues

db9782f

Merge branch 'develop' into update-packages

91ce4d2

# Conflicts: # package.json # yarn.lock

update packages

49184b6

update packages

219e356

remove babel-preset-es2015

fd59c22

codeBelt changed the title ~~Develop~~ Develop > Master Mar 12, 2018

codeBelt merged commit 34d56c9 into master Mar 12, 2018

codeBelt deleted the develop branch March 12, 2018 06:24

Provide feedback