Merge branch 'master' into latest

Merge branch 'master' into latest # Conflicts: # package-lock.json # packages/ag-grid-angular/package-lock.json # packages/ag-grid-aurelia/package-lock.json # packages/ag-grid-docs/package.json # packages/ag-grid-enterprise/package.json # packages/ag-grid-react/package-lock.json # packages/ag-grid-vue/package-lock.json
2018-07-05 11:14:57 +01:00
parent 3591b78e4b 847005c758
commit 60181add9a
1 changed files with 4 additions and 4 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ag-grid-react-example",
-  "version": "17.1.0",
+  "version": "18.1.0",
  "description": "Example Reach applicaiton using ag-Grid.",
  "main": "dist/ag-grid-react-example.js",
  "scripts": {
@@ -57,9 +57,9 @@
    "typescript": "2.3.x"
  },
  "dependencies": {
-    "ag-grid": "^18.0.0",
-    "ag-grid-enterprise": "^18.0.0",
-    "ag-grid-react": "^18.0.0",
+    "ag-grid": "^18.1.0",
+    "ag-grid-enterprise": "^18.1.0",
+    "ag-grid-react": "^18.1.0",
    "bootstrap": "3.3.7",
    "d3": "4.9.1",
    "file-loader": "0.11.1",