Merge branch 'pnp:dev' into dev

IRRDC · Jun 7, 2024 · 3e3d0b5 · 3e3d0b5
2 parents 0d528cc + 511dd5e
commit 3e3d0b5
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/CHANGELOG.json b/CHANGELOG.json
@@ -9,6 +9,21 @@
       },
       "contributions": []
     },
+    {
+      "version": "3.18.1",
+      "changes": {
+        "new": [],
+        "enhancements": [],
+        "fixes": [
+          "`FilePicker`: Fix issue with adding link by typing in 'From a link' tab [#1814](https://github.com/pnp/sp-dev-fx-controls-react/pull/1814)",
+          "Update nl-nl.ts [#1823](https://github.com/pnp/sp-dev-fx-controls-react/pull/1823)"
+        ]
+      },
+      "contributions": [
+        "[Antanina Druzhkina](https://github.com/Ateina)",
+        "[Elio Struyf](https://github.com/estruyf)"
+      ]
+    },
     {
       "version": "3.18.0",
       "changes": {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 ## 3.19.0
 
+## 3.18.1
+
+### Fixes
+
+- `FilePicker`: Fix issue with adding link by typing in 'From a link' tab [#1814](https://github.com/pnp/sp-dev-fx-controls-react/pull/1814)
+- Update nl-nl.ts [#1823](https://github.com/pnp/sp-dev-fx-controls-react/pull/1823)
+
+### Contributors
+
+Special thanks to our contributors (in alphabetical order): [Antanina Druzhkina](https://github.com/Ateina), [Elio Struyf](https://github.com/estruyf).
+
 ## 3.18.0
 
 ### Enhancements

diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md
@@ -2,6 +2,17 @@
 
 ## 3.19.0
 
+## 3.18.1
+
+### Fixes
+
+- `FilePicker`: Fix issue with adding link by typing in 'From a link' tab [#1814](https://github.com/pnp/sp-dev-fx-controls-react/pull/1814)
+- Update nl-nl.ts [#1823](https://github.com/pnp/sp-dev-fx-controls-react/pull/1823)
+
+### Contributors
+
+Special thanks to our contributors (in alphabetical order): [Antanina Druzhkina](https://github.com/Ateina), [Elio Struyf](https://github.com/estruyf).
+
 ## 3.18.0
 
 ### Enhancements

diff --git a/src/common/telemetry/version.ts b/src/common/telemetry/version.ts
@@ -1 +1 @@
-export const version: string = "3.19.0";
+export const version: string = "3.18.1";
diff --git a/src/loc/nl-nl.ts b/src/loc/nl-nl.ts
@@ -145,7 +145,7 @@ define([], () => {
     "HighlightColorTeal": "Taling",
     "HighlightColorDarkgreen": "Donkergroen",
     "HighlightColorPurple": "Paarse",
-    "HighlightColorMaroon": "Bosneger",
+    "HighlightColorMaroon": "Kastanjebruin",
     "HighlightColorGold": "Goud",
     "HighlightColorDarkgrey": "Donkergrijs",
     "HighlightColorGrey": "Grijs",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const version: string = "3.19.0";
		export const version: string = "3.18.1";