Merge master into develop

eea · Nov 18, 2021 · 95951f3 · 95951f3
2 parents 594ad08 + aee4466
commit 95951f3
Show file tree

Hide file tree

Showing 6 changed files with 182 additions and 126 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Release @eeacms/volto-industry-theme@1.1.4 [`ee65ad5`](https://github.com/eea/industry-frontend/commit/ee65ad5dd26a5366e729657b7455e97f89ec29d3)
 - Update Dockerfile [`160af5d`](https://github.com/eea/industry-frontend/commit/160af5d7833b60c0d8c220d8b5b0066286ea989f)
 - Rename jsconfig.json.tpl to jsconfig.json.prod [`779535c`](https://github.com/eea/industry-frontend/commit/779535cdce022bf8b97c503228dbc1047d01d214)
+- Update [`f286d6f`](https://github.com/eea/industry-frontend/commit/f286d6f0642562202f8dcd2f5e28bff57a9c7eb2)
 
 #### [3.2.3](https://github.com/eea/industry-frontend/compare/3.2.2...3.2.3)
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@eeacms/industry-frontend",
   "description": "Volto-based frontend server and SPA for the Industrial Emissions Portal website (former EPRTR) industry.eea.europa.eu",
   "license": "MIT",
-  "version": "3.3.0",
+  "version": "3.2.4",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
   "homepage": "https://github.com/eea/industry-frontend",

diff --git a/patches/patchit.sh b/patches/patchit.sh
diff --git a/patches/razzle-jest.patch b/patches/razzle-jest.patch
diff --git a/public/robots.txt b/public/robots.txt