Merge pull request #11399 from RocketChat/develop-sync

Merge master into develop & Set version to 0.67.0-develop
RocketChat · Jul 9, 2018 · 656a930 · 656a930
2 parents 8014455 + 33e372d
commit 656a930
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 1 deletion.
diff --git a/.github/history.json b/.github/history.json
@@ -16791,6 +16791,50 @@
           ]
         }
       ]
+    },
+    "0.66.2": {
+      "node_version": "8.11.3",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "11359",
+          "title": "Send setting Allow_Marketing_Emails to statistics collector",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.2",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11364",
+          "title": "Regression: Fix migration 125 checking for settings field",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.66.2",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "11365",
+          "title": "[FIX] Remove file snap store doesn't like",
+          "userLogin": "geekgonecrazy",
+          "milestone": "0.66.2",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11266",
+          "title": "[FIX] Livechat not sending desktop notifications",
+          "userLogin": "renatobecker",
+          "milestone": "0.66.2",
+          "contributors": [
+            "renatobecker",
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,7 +19,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 79,  # Increment this for every release.
+		appVersion = 80,  # Increment this for every release.
 
 		appMarketingVersion = (defaultText = "0.67.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,4 +1,31 @@
 
+# 0.66.2
+`2018-07-06  ·  2 🐛  ·  2 🔍  ·  4 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.3`
+- NPM: `5.6.0`
+
+### 🐛 Bug fixes
+
+- Remove file snap store doesn't like ([#11365](https://github.com/RocketChat/Rocket.Chat/pull/11365))
+- Livechat not sending desktop notifications ([#11266](https://github.com/RocketChat/Rocket.Chat/pull/11266))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Send setting Allow_Marketing_Emails to statistics collector ([#11359](https://github.com/RocketChat/Rocket.Chat/pull/11359))
+- Regression: Fix migration 125 checking for settings field ([#11364](https://github.com/RocketChat/Rocket.Chat/pull/11364))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.66.1
 `2018-07-04  ·  5 🐛  ·  1 🔍  ·  6 👩‍💻👨‍💻`