Merge remote-tracking branch 'origin/master' into latest

Merge remote-tracking branch 'origin/master' into latest

# Conflicts:
#	src/index.php
This commit is contained in:
Alberto
2018-03-08 12:02:45 +01:00

View File

@@ -1,6 +1,6 @@
{ {
"name": "ag-grid-react-example", "name": "ag-grid-react-example",
"version": "16.0.0", "version": "17.0.0",
"description": "Example Reach applicaiton using ag-Grid.", "description": "Example Reach applicaiton using ag-Grid.",
"main": "dist/ag-grid-react-example.js", "main": "dist/ag-grid-react-example.js",
"scripts": { "scripts": {
@@ -58,9 +58,9 @@
"typescript": "2.3.x" "typescript": "2.3.x"
}, },
"dependencies": { "dependencies": {
"ag-grid": "^16.0.0", "ag-grid": "^17.0.0",
"ag-grid-enterprise": "^16.0.0", "ag-grid-enterprise": "^17.0.0",
"ag-grid-react": "^16.0.0", "ag-grid-react": "^17.0.0",
"bootstrap": "3.3.7", "bootstrap": "3.3.7",
"d3": "4.9.1", "d3": "4.9.1",
"file-loader": "0.11.1", "file-loader": "0.11.1",