Merge branch 'latest' into 13.0.0

# Conflicts: # package.json
2017-08-25 16:59:25 +02:00
parent 15ba8d7e60
commit 818b7798ee
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": "12.0.0",
+  "version": "13.0.0",
  "description": "Example Reach applicaiton using ag-Grid.",
  "main": "dist/ag-grid-react-example.js",
  "scripts": {
@@ -68,8 +68,8 @@
    "react-redux": "5.0.x",
    "redux": "3.6.x",
    "url-search-params-polyfill": "1.2.0",
-    "ag-grid": "12.0.x",
-    "ag-grid-enterprise": "12.0.x",
-    "ag-grid-react": "12.0.x"
+    "ag-grid": "13.0.x",
+    "ag-grid-enterprise": "13.0.x",
+    "ag-grid-react": "13.0.x"
  }
 }