Merge remote-tracking branch 'origin/master'

This commit is contained in:
ceolter
2017-01-03 14:13:12 +00:00

View File

@@ -1,6 +1,6 @@
{
"name": "ag-grid-react-example",
"version": "5.5.0",
"version": "7.1.1",
"description": "Example Reach applicaiton using ag-Grid.",
"main": "dist/ag-grid-react-example.js",
"scripts": {
@@ -27,6 +27,7 @@
"babel-loader": "6.2.1",
"babel-preset-es2015": "6.3.13",
"babel-preset-react": "6.3.13",
"babel-core": "^6.0.0",
"css-loader": "0.23.1",
"style-loader": "0.13.0",
"webpack": "1.12.11",
@@ -35,8 +36,8 @@
"dependencies": {
"react": "0.14.6",
"react-dom": "0.14.6",
"ag-grid": "file:../ag-grid-release/ag-grid",
"ag-grid-enterprise": "file:../ag-grid-release/ag-grid",
"ag-grid-react": "file:../ag-grid-react"
"ag-grid": "7.1.x",
"ag-grid-enterprise": "7.1.x",
"ag-grid-react": "7.1.x"
}
}