Merge branch 'latest' into 13.1.0

# Conflicts: # aot/dist/agGridColumn.ngfactory.ts # aot/dist/agGridColumn.ngsummary.json # aot/dist/agGridNg2.ngfactory.ts # aot/dist/agGridNg2.ngsummary.json # aot/dist/aggrid.module.ngfactory.ts # aot/dist/aggrid.module.ngsummary.json # aot/dist/baseComponentFactory.ngsummary.json # aot/dist/interfaces.ngsummary.json # aot/dist/ng2ComponentFactory.ngsummary.json # aot/dist/ng2FrameworkComponentWrapper.ngsummary.json # aot/dist/ng2FrameworkFactory.ngsummary.json # aot/main.ngsummary.json # aot/src/agGridColumn.ngfactory.ts # aot/src/agGridColumn.ngsummary.json # aot/src/agGridNg2.ngfactory.ts # aot/src/agGridNg2.ngsummary.json # aot/src/aggrid.module.ngfactory.ts # aot/src/aggrid.module.ngsummary.json # aot/src/baseComponentFactory.ngsummary.json # aot/src/interfaces.ngsummary.json # aot/src/ng2ComponentFactory.ngsummary.json # aot/src/ng2FrameworkComponentWrapper.ngsummary.json # aot/src/ng2FrameworkFactory.ngsummary.json
2017-09-01 14:02:24 +01:00
parent 73cc989512
commit 3b5eaac21a
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": "13.0.1",
+  "version": "13.1.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": "13.0.x",
-    "ag-grid-enterprise": "13.0.x",
-    "ag-grid-react": "13.0.x"
+    "ag-grid": "13.1.x",
+    "ag-grid-enterprise": "13.1.x",
+    "ag-grid-react": "13.1.x"
  }
 }