 Fabio Berger
		
	
	d370296e82
	
	
	Merge branch 'development' into breakUp0xjs
			Fabio Berger
		
	
	d370296e82
	
	
	Merge branch 'development' into breakUp0xjs
		
			
			* development:
  Fix ganache subprovider config
  Fix a bug in compiler config precedence
  Fix linter errors
  Fix templates
  Remove unused deployer docs configs
  Add a legacy endpoint for the deployer
  Add a check for compiler output
  Add a comment
  Put ARTIFACTS_VERSION in a config
  Improve a comment
  Remove _applyDefaultsToDeployTxDataAsync
  Add a HACK comment
  Fix linter issues
  Rename deployer to sol-compiler
  Remove deployer
  Remove deployer from 0x.js and migrations
  Configure migrations with a compiler.json
  Remove deployer from metacoin and contract tests
  Update wallet footer and add remove token functionality
# Conflicts:
#	.gitignore
#	packages/0x.js/package.json
#	packages/0x.js/src/0x.ts
#	packages/contracts/package.json
#	packages/contracts/test/multi_sig_with_time_lock.ts
#	packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
#	packages/contracts/util/artifacts.ts
#	packages/deployer/test/deployer_test.ts
#	packages/migrations/package.json
		
	
 
		2018-05-11 12:32:57 +02:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2018-05-10 17:47:38 +02:00
		 
	
		
			
			
			
			
			
			2018-05-10 17:47:38 +02:00
		 
	
		
			
			
			
			
			
			2018-05-11 12:32:57 +02:00
		 
	
		
			
			
			
			
			
			2018-05-10 18:26:44 +02:00
		 
	
		
			
			
			
			
			
			2018-05-10 17:47:38 +02:00
		 
	
		
			
			
			
			
			
			2018-05-10 17:47:38 +02:00
		 
	
		
			
			
			
			
			
			2018-05-10 17:47:38 +02:00