From 3b5eaac21a9a4683010aeb4c87ae5e7aadd8b6d8 Mon Sep 17 00:00:00 2001 From: Alberto Date: Fri, 1 Sep 2017 14:02:24 +0100 Subject: [PATCH] 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 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 6ee4e22..7cc0aba 100644 --- 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" } }