Skip to content

Commit

Permalink
Merge pull request #29 from greenpeace/develop
Browse files Browse the repository at this point in the history
merge develop to master
  • Loading branch information
tkhg authored Mar 30, 2021
2 parents 444a4fb + 06a8e3f commit 6036ec7
Show file tree
Hide file tree
Showing 89 changed files with 77 additions and 746 deletions.
2 changes: 1 addition & 1 deletion assets/src/gpj-annual-report-2020/404.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta name="viewport" content="width=device-width"/><meta charSet="utf-8"/><title>404: This page could not be found</title><meta name="next-head-count" content="3"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/css/55c1ab76dff95b982a1a.css" as="style"/><link rel="stylesheet" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/css/55c1ab76dff95b982a1a.css" data-n-g=""/><noscript data-n-css=""></noscript><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/main-c1fbdf5b5b4a01acd42a.js" as="script"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/webpack-50bee04d1dc61f8adf5b.js" as="script"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/framework.0c239260661ae1d12aa2.js" as="script"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/f6078781a05fe1bcb0902d23dbbb2662c8d200b3.4f02855550855d496523.js" as="script"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/pages/_app-b597c714fcc791a81e66.js" as="script"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/pages/_error-1555e415f676fbe7b596.js" as="script"/></head><body><div id="__next"><div style="color:#000;background:#fff;font-family:-apple-system, BlinkMacSystemFont, Roboto, &quot;Segoe UI&quot;, &quot;Fira Sans&quot;, Avenir, &quot;Helvetica Neue&quot;, &quot;Lucida Grande&quot;, sans-serif;height:100vh;text-align:center;display:flex;flex-direction:column;align-items:center;justify-content:center"><div><style>body { margin: 0 }</style><h1 style="display:inline-block;border-right:1px solid rgba(0, 0, 0,.3);margin:0;margin-right:20px;padding:10px 23px 10px 0;font-size:24px;font-weight:500;vertical-align:top">404</h1><div style="display:inline-block;text-align:left;line-height:49px;height:49px;vertical-align:middle"><h2 style="font-size:14px;font-weight:normal;line-height:inherit;margin:0;padding:0">This page could not be found<!-- -->.</h2></div></div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"urOy0LRjarBqMXzFUAIxs","assetPrefix":"/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020","nextExport":true,"isFallback":false,"gip":true}</script><script nomodule="" src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/polyfills-aa54647e89713304033b.js"></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/main-c1fbdf5b5b4a01acd42a.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/webpack-50bee04d1dc61f8adf5b.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/framework.0c239260661ae1d12aa2.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/f6078781a05fe1bcb0902d23dbbb2662c8d200b3.4f02855550855d496523.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/pages/_app-b597c714fcc791a81e66.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/pages/_error-1555e415f676fbe7b596.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/urOy0LRjarBqMXzFUAIxs/_buildManifest.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/urOy0LRjarBqMXzFUAIxs/_ssgManifest.js" async=""></script></body></html>
<!DOCTYPE html><html><head><meta name="viewport" content="width=device-width"/><meta charSet="utf-8"/><title>404: This page could not be found</title><meta name="next-head-count" content="3"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/css/7cbc9a1011f427762ba6.css" as="style"/><link rel="stylesheet" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/css/7cbc9a1011f427762ba6.css" data-n-g=""/><noscript data-n-css=""></noscript><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/main-c1fbdf5b5b4a01acd42a.js" as="script"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/webpack-50bee04d1dc61f8adf5b.js" as="script"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/framework.0c239260661ae1d12aa2.js" as="script"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/f6078781a05fe1bcb0902d23dbbb2662c8d200b3.4f02855550855d496523.js" as="script"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/pages/_app-9f5bef006b8a9730d77b.js" as="script"/><link rel="preload" href="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/pages/_error-1555e415f676fbe7b596.js" as="script"/></head><body><div id="__next"><div style="color:#000;background:#fff;font-family:-apple-system, BlinkMacSystemFont, Roboto, &quot;Segoe UI&quot;, &quot;Fira Sans&quot;, Avenir, &quot;Helvetica Neue&quot;, &quot;Lucida Grande&quot;, sans-serif;height:100vh;text-align:center;display:flex;flex-direction:column;align-items:center;justify-content:center"><div><style>body { margin: 0 }</style><h1 style="display:inline-block;border-right:1px solid rgba(0, 0, 0,.3);margin:0;margin-right:20px;padding:10px 23px 10px 0;font-size:24px;font-weight:500;vertical-align:top">404</h1><div style="display:inline-block;text-align:left;line-height:49px;height:49px;vertical-align:middle"><h2 style="font-size:14px;font-weight:normal;line-height:inherit;margin:0;padding:0">This page could not be found<!-- -->.</h2></div></div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"A6eTw5Ev34P90VOw_vM73","assetPrefix":"/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020","nextExport":true,"isFallback":false,"gip":true}</script><script nomodule="" src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/polyfills-aa54647e89713304033b.js"></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/main-c1fbdf5b5b4a01acd42a.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/webpack-50bee04d1dc61f8adf5b.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/framework.0c239260661ae1d12aa2.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/f6078781a05fe1bcb0902d23dbbb2662c8d200b3.4f02855550855d496523.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/pages/_app-9f5bef006b8a9730d77b.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/chunks/pages/_error-1555e415f676fbe7b596.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/A6eTw5Ev34P90VOw_vM73/_buildManifest.js" async=""></script><script src="/japan/wp-content/themes/planet4-child-theme-japan/assets/src/gpj-annual-report-2020/_next/static/A6eTw5Ev34P90VOw_vM73/_ssgManifest.js" async=""></script></body></html>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading

0 comments on commit 6036ec7

Please sign in to comment.