Merge branch 'master' into WSAF-4551_custom_tracking

* master: 1.0.4 docs: Add keywords to package.json. This should list us on the videoj… (googleads#486)
widespace-os · Jan 29, 2018 · c8d6c16 · c8d6c16
2 parents 418b5f3 + 670360b
commit c8d6c16
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="1.0.4"></a>
+## [1.0.4](https://github.com/googleads/videojs-ima/compare/v1.0.3...v1.0.4) (2018-01-17)
+
+### Documentation
+
+* Add keywords to package.json. This should list us on the videoj… ([#486](https://github.com/googleads/videojs-ima/issues/486)) ([7af46cf](https://github.com/googleads/videojs-ima/commit/7af46cf))
+* Update README with new snippet and codepen link. ([#483](https://github.com/googleads/videojs-ima/issues/483)) ([2d40f74](https://github.com/googleads/videojs-ima/commit/2d40f74))
+
 <a name="1.0.3"></a>
 ## [1.0.3](https://github.com/googleads/videojs-ima/compare/v1.0.2...v1.0.3) (2018-01-03)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "videojs-ima",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "license": "Apache-2.0",
   "main": "./dist/videojs.ima.js",
   "author": {
@@ -64,5 +64,9 @@
     "selenium-webdriver": "^3.6.0",
     "uglify-es": "^3.1.10",
     "watch": "^1.0.2"
-  }
+  },
+  "keywords": [
+    "videojs",
+    "videojs-plugin"
+  ]
 }