Merge pull request #951 from newrelic/develop

caylahamann · web-flow · commit 78672300bc64 · 2020-11-10T16:25:07.000-05:00
Release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# [1.30.0](https://github.com/newrelic/developer-website/compare/v1.29.1...v1.30.0) (2020-11-10)
+
+
+### Features
+
+* Add speaker pic ([26c067d](https://github.com/newrelic/developer-website/commit/26c067d7c94366a80a31836da510a8bc9edf55ee))
+
+## [1.29.1](https://github.com/newrelic/developer-website/compare/v1.29.0...v1.29.1) (2020-11-06)
+
+
+### Bug Fixes
+
+* ensure the marketo instance and munchkin IDs are updated ([d473838](https://github.com/newrelic/developer-website/commit/d4738388da268346c31e6bc7d8a4c34ec5738131))
+* show error if the form cannot be loaded ([99b38e6](https://github.com/newrelic/developer-website/commit/99b38e61c1e89b32ef96557f64e9a03af7d733da))
+
 # [1.29.0](https://github.com/newrelic/developer-website/compare/v1.28.1...v1.29.0) (2020-11-06)
 
 
diff --git a/gatsby-ssr.js b/gatsby-ssr.js
@@ -21,5 +21,4 @@ const onPreRenderHTML = ({
   ]);
 };
 
-
 export { onPreRenderHTML, wrapPageElement };
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "developer-website",
   "private": true,
-  "version": "1.29.0",
+  "version": "1.30.0",
   "dependencies": {
     "@emotion/core": "^10.0.35",
     "@emotion/styled": "^10.0.27",
diff --git a/src/components/Seo.js b/src/components/Seo.js
@@ -27,7 +27,7 @@ function SEO({ description, lang, meta, title, tags }) {
 
     {
       name: 'google-site-verification',
-      content: 'eT8TSNhvMuDmAtqbtq5jygZKVkhDmz565fYQ3DVop4g',
+      content: 'He_vizRXYX_mUhwBe3BmyaMxNnVRAZbq_Jtm2A0e4WY',
     },
   ];
 
diff --git a/src/images/nerd-days/emea-speakers/BenEvans.jpg b/src/images/nerd-days/emea-speakers/BenEvans.jpg
diff --git a/src/pages/emea-nerd-days.js b/src/pages/emea-nerd-days.js
@@ -37,6 +37,7 @@ import WilliamJanssen from '../images/nerd-days/emea-speakers/WilliamJanssen.jpg
 import ManeshTailor from '../images/nerd-days/emea-speakers/ManeshTailor.jpg';
 import SteveWoodard from '../images/nerd-days/emea-speakers/SteveWoodard.jpg';
 import IdirOuhab from '../images/nerd-days/emea-speakers/IdirOuhab.jpg';
+import BenEvans from '../images/nerd-days/emea-speakers/BenEvans.jpg';
 
 const speakers = [
   {
@@ -45,6 +46,12 @@ const speakers = [
     title: 'Principal Software Engineer',
     company: 'Ocado Technology',
   },
+  {
+    name: 'Ben Evans',
+    image: BenEvans,
+    title: 'Principal Software Engineer',
+    company: 'New Relic',
+  },
   {
     name: 'Daisy Muyldermans',
     image: DaisyMuyldermans,

-Original file line number
+Diff line change
   ]);
 };
+-
 export { onPreRenderHTML, wrapPageElement };
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "developer-website",`
`3`	`3`	`"private": true,`
`4`		`- "version": "1.29.0",`
	`4`	`+ "version": "1.30.0",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@emotion/core": "^10.0.35",`
`7`	`7`	`"@emotion/styled": "^10.0.27",`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function SEO({ description, lang, meta, title, tags }) {`
`27`	`27`
`28`	`28`	`{`
`29`	`29`	`name: 'google-site-verification',`
`30`		`- content: 'eT8TSNhvMuDmAtqbtq5jygZKVkhDmz565fYQ3DVop4g',`
	`30`	`+ content: 'He_vizRXYX_mUhwBe3BmyaMxNnVRAZbq_Jtm2A0e4WY',`
`31`	`31`	`},`
`32`	`32`	`];`
`33`	`33`