merge with master

Author: AJIXuMuK

CHANGELOG.JSON

@@ -26,6 +26,15 @@
         "[jumpei-yamauchi](https://github.com/jumpei-yamauchi)"
       ]
     },
+    {
+      "version": "3.4.1",
+      "changes": {
+        "new": [],
+        "enhancements": [],
+        "fixes": []
+      },
+      "contributions": []
+    },
     {
       "version": "3.4.0",
       "changes": {

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Releases
 
+<<<<<<< HEAD
 ## 3.5.0
 
 ### Enhancements
@@ -17,6 +18,9 @@
 ### Contributors
 
 Special thanks to our contributors (in alphabetical order): [Gautam Sheth](https://github.com/gautamdsheth), [Jouni Pohjolainen](https://github.com/jonepo), [Louis Pineau](https://github.com/pineaulo), [Michalis Koutroupis](https://github.com/mkoutroupis), [MonalisaBaltatescu](https://github.com/MonalisaBaltatescu), [Patrik Hellgren](https://github.com/patrikhellgren).
+=======
+## 3.4.1
+>>>>>>> master
 
 ## 3.4.0
 

docs/documentation/docs/about/release-notes.md

@@ -1,5 +1,6 @@
 # Releases
 
+<<<<<<< HEAD
 ## 3.5.0
 
 ### Enhancements
@@ -17,6 +18,9 @@
 ### Contributors
 
 Special thanks to our contributors (in alphabetical order): [Gautam Sheth](https://github.com/gautamdsheth), [Jouni Pohjolainen](https://github.com/jonepo), [Louis Pineau](https://github.com/pineaulo), [Michalis Koutroupis](https://github.com/mkoutroupis), [MonalisaBaltatescu](https://github.com/MonalisaBaltatescu), [Patrik Hellgren](https://github.com/patrikhellgren).
+=======
+## 3.4.1
+>>>>>>> master
 
 ## 3.4.0
 

src/common/telemetry/version.ts

@@ -1 +1 @@
-export const version: string = "3.5.0";
+export const version: string = "3.5.0";