Merge branch 'frontierMaster' into rileytb/EOLBFRST-253_wd-move-browser-upgrade-landing-page-to-react

Author: rileytb

CHANGELOG-FRONTIER.md

@@ -1,3 +1,9 @@
+## 8.6.0
+
+- Add some logic in webpack.config.js to look for CRA_MAGIC_ZION_UI_VERSION and CRA_MAGIC_REACT_SCRIPTS_VERSION and calculate
+  those versions based on the info in their respective package.json files, and send that info to DefinePlugin, which will
+  inject the values directly into any code that has that variable name (which will be in @fs/zion-config)
+
 ## 8.5.5
 
 - Fix proxy to work with Russian test user

freshCraTemplateUpdate.sh

@@ -27,8 +27,8 @@ git commit -a -m 'editing blueprint.yml, fixing @fs/react-scripts version'
 git remote add origin https://github.com/fs-webdev/fresh-cra-template.git
 
 if [ "$1" == next ]; then
-	echo Is next branch, pushing to fresh-cra-template next branch
-	git push --force origin master:next
+  echo Is next branch, pushing to fresh-cra-template next branch
+  git push --force origin master:next
 else
-	git push --force origin master
+  git push --force origin master
 fi