merge development
This commit is contained in:
		@@ -1,4 +1,13 @@
 | 
			
		||||
[
 | 
			
		||||
    {
 | 
			
		||||
        "timestamp": 1538157789,
 | 
			
		||||
        "version": "1.0.12",
 | 
			
		||||
        "changes": [
 | 
			
		||||
            {
 | 
			
		||||
                "note": "Dependencies updated"
 | 
			
		||||
            }
 | 
			
		||||
        ]
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
        "timestamp": 1537907159,
 | 
			
		||||
        "version": "1.0.11",
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 | 
			
		||||
 | 
			
		||||
CHANGELOG
 | 
			
		||||
 | 
			
		||||
## v1.0.12 - _September 28, 2018_
 | 
			
		||||
 | 
			
		||||
    * Dependencies updated
 | 
			
		||||
 | 
			
		||||
## v1.0.11 - _September 25, 2018_
 | 
			
		||||
 | 
			
		||||
    * Dependencies updated
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
    "name": "@0xproject/react-docs",
 | 
			
		||||
    "version": "1.0.11",
 | 
			
		||||
    "version": "1.0.12",
 | 
			
		||||
    "engines": {
 | 
			
		||||
        "node": ">=6.12"
 | 
			
		||||
    },
 | 
			
		||||
@@ -23,7 +23,7 @@
 | 
			
		||||
        "url": "https://github.com/0xProject/0x-monorepo.git"
 | 
			
		||||
    },
 | 
			
		||||
    "devDependencies": {
 | 
			
		||||
        "@0xproject/dev-utils": "^1.0.10",
 | 
			
		||||
        "@0xproject/dev-utils": "^1.0.11",
 | 
			
		||||
        "@0xproject/tslint-config": "^1.0.7",
 | 
			
		||||
        "@types/compare-versions": "^3.0.0",
 | 
			
		||||
        "copyfiles": "^2.0.0",
 | 
			
		||||
@@ -33,9 +33,9 @@
 | 
			
		||||
        "typescript": "3.0.1"
 | 
			
		||||
    },
 | 
			
		||||
    "dependencies": {
 | 
			
		||||
        "@0xproject/react-shared": "^1.0.12",
 | 
			
		||||
        "@0xproject/types": "^1.1.0",
 | 
			
		||||
        "@0xproject/utils": "^1.0.11",
 | 
			
		||||
        "@0xproject/react-shared": "^1.0.13",
 | 
			
		||||
        "@0xproject/types": "^1.1.2",
 | 
			
		||||
        "@0xproject/utils": "^2.0.0",
 | 
			
		||||
        "@types/lodash": "4.14.104",
 | 
			
		||||
        "@types/material-ui": "^0.20.0",
 | 
			
		||||
        "@types/node": "*",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user