Merge production into master

mozilla · Apr 10, 2018 · 74dc9bd · 74dc9bd
2 parents a1f6dc1 + ca008ac
commit 74dc9bd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.0.0
+
+* Adds the multi-note feature
+
 ## 3.1.0 (2018-03-16)
 
 * New menu design

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "notes",
   "id": "notes@mozilla.com",
   "description": "Displays a sidebar that lets you take notes on web pages.",
-  "version": "3.2.0dev",
+  "version": "4.0.0",
   "author": "Test Pilot Mozilla Team",
   "bugs": {
     "url": "https://github.com/mozilla/notes/issues"

diff --git a/src/manifest.json b/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Firefox Notes",
   "description": "Displays a sidebar that lets you take notes on web pages.",
-  "version": "3.2.0dev",
+  "version": "4.0.0",
   "default_locale": "en_US",
   "author": "Mozilla Test Pilot team",
   "applications": {