Skip to content

Commit

Permalink
Merge master into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
razvanMiu committed Nov 20, 2021
2 parents 9dc36c5 + dad2a8e commit 030c6bf
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 14 deletions.
14 changes: 12 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [3.3.0](https://github.com/eea/industry-frontend/compare/3.2.4...3.3.0)
#### [3.3.0](https://github.com/eea/industry-frontend/compare/3.2.6...3.3.0)

- Release @eeacms/volto-industry-theme@1.1.7 [`8446d3c`](https://github.com/eea/industry-frontend/commit/8446d3c3c5a54382555c4512e56c8c5af113fe27)
- Merge master into develop [`95951f3`](https://github.com/eea/industry-frontend/commit/95951f3f701ab95e8c4c7bdcc98a2fddf4761d56)
Expand All @@ -15,13 +15,23 @@ 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)
#### [3.2.6](https://github.com/eea/industry-frontend/compare/3.2.5...3.2.6)

- Update [`0c61638`](https://github.com/eea/industry-frontend/commit/0c6163882f59f7a63aefb480652b0923abf57564)

#### [3.2.5](https://github.com/eea/industry-frontend/compare/3.2.4...3.2.5)

> 19 November 2021
- Release 3.2.5 [`88858cf`](https://github.com/eea/industry-frontend/commit/88858cf4f6bfb7817955f999c169639ee3e29db8)
- Update [`b1146b4`](https://github.com/eea/industry-frontend/commit/b1146b47b86ff1bcd715133cacc86ff78e527ac8)

#### [3.2.4](https://github.com/eea/industry-frontend/compare/3.2.3...3.2.4)

> 19 November 2021
- Release 3.2.4 [`aee4466`](https://github.com/eea/industry-frontend/commit/aee4466b80094a15b36baf64ee13383430f25011)
- Update [`f286d6f`](https://github.com/eea/industry-frontend/commit/f286d6f0642562202f8dcd2f5e28bff57a9c7eb2)
- Release 3.2.4 [`aee4466`](https://github.com/eea/industry-frontend/commit/aee4466b80094a15b36baf64ee13383430f25011)

#### [3.2.3](https://github.com/eea/industry-frontend/compare/3.2.2...3.2.3)

Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2805,9 +2805,9 @@
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==

"@types/node@*", "@types/node@>= 8":
version "16.11.8"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.8.tgz#a1aeb23f0aa33cb111e64ccaa1687b2ae0423b69"
integrity sha512-hmT5gfpRkkHr7DZZHMf3jBe/zNcVGN+jXSL2f8nAsYfBPxQFToKwQlS/zES4Sjp488Bi73i+p6bvrNRRGU0x9Q==
version "16.11.9"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.9.tgz#879be3ad7af29f4c1a5c433421bf99fab7047185"
integrity sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==

"@types/node@^14.14.31":
version "14.17.34"
Expand Down Expand Up @@ -7336,9 +7336,9 @@ ee-first@1.1.1:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=

electron-to-chromium@^1.3.341, electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.896:
version "1.3.902"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.902.tgz#926726705c17f9531be23bda545b819b35da665d"
integrity sha512-zFv5jbtyIr+V9FuT9o439isXbkXQ27mJqZfLXpBKzXugWE8+3RotHbXJlli0/r+Rvdlkut0OOMzeOWLAjH0jCw==
version "1.3.904"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz#52a353994faeb0f2a9fab3606b4e0614d1af7b58"
integrity sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==

elegant-spinner@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -15936,9 +15936,9 @@ react-input-autosize@^3.0.0:
prop-types "^15.5.8"

react-intersection-observer@^8.32.0:
version "8.32.2"
resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-8.32.2.tgz#527eeecf569309d64ed96330636d90aac336c957"
integrity sha512-QTcea+n28AvOHbTku+jErfQqknbc4Nuh7EUNik8p/JMN56W2Jhjs+qcYZzQhAoyLX8pZD0QXpYX0lW87faackQ==
version "8.32.3"
resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-8.32.3.tgz#71f696623e8aa13ad8ec6861ef86b2b758e13a6d"
integrity sha512-p/Na/tgMCvfA568QSd0cgJ2J5jWV/F6aNEP+phx3TpjbToIujFsKSttgFQhp91NUBqfQMXzzxONChQbOJHwrOw==

react-intl-redux@2.2.0:
version "2.2.0"
Expand Down Expand Up @@ -17707,9 +17707,9 @@ source-map-support@^0.4.15:
source-map "^0.5.6"

source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12:
version "0.5.20"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
version "0.5.21"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
Expand Down

0 comments on commit 030c6bf

Please sign in to comment.