Merge branch 'master' into adding-owner-reserve

vinay035 · web-flow · commit c8cd7df86161 · 2018-01-12T22:22:04.000+05:30
diff --git a/Vanity.sol b/Vanity.sol
@@ -134,7 +134,7 @@ contract VanityURL is Ownable,Pausable {
     transferTokenTo = _transferTokenTo;
   }
 
-  event VanityReserved(address _from, string _vanity_url);
+  event VanityReserved(address _to, string _vanity_url);
   event VanityTransfered(address _to,address _from, string _vanity_url);
   event VanityReleased(string _vanity_url);
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ contract VanityURL is Ownable,Pausable {`
`134`	`134`	`transferTokenTo = _transferTokenTo;`
`135`	`135`	`}`
`136`	`136`
`137`		`- event VanityReserved(address _from, string _vanity_url);`
	`137`	`+ event VanityReserved(address _to, string _vanity_url);`
`138`	`138`	`event VanityTransfered(address _to,address _from, string _vanity_url);`
`139`	`139`	`event VanityReleased(string _vanity_url);`
`140`	`140`