Merge with master

2017-05-21 16:08:47 -04:00
parent 929367f0ab
commit a6a2ee2bf1
61 changed files with 1272 additions and 227 deletions
--- a/contracts/ownership/Claimable.sol
+++ b/contracts/ownership/Claimable.sol
@ -1,4 +1,4 @@
-pragma solidity ^0.4.0;
+pragma solidity ^0.4.8;


 import './Ownable.sol';