Merge branch 'latest' into 13.0.0

# Conflicts: # package.json
ag-grid · Aug 25, 2017 · 818b779 · 818b779
1 parent 15ba8d7
commit 818b779
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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"
   }
 }