AZ 8804b37e7e Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/main/java/jota/IotaAPIProxy.java # src/main/java/jota/error/ArgumentException.java # src/main/java/jota/error/BaseException.java # src/main/java/jota/error/NotEnoughBalanceException.java # src/main/java/jota/model/Bundle.java # src/main/java/jota/model/Transaction.java # src/main/java/jota/model/Transfer.java # src/main/java/jota/utils/Converter.java # src/main/java/jota/utils/InputValidator.java # src/main/java/jota/utils/IotaAPIUtils.java # src/main/java/jota/utils/Signing.java # src/test/java/jota/IotaAPIProxyTest.java		2016-12-22 19:55:17 +01:00
..
java/jota	Merge remote-tracking branch 'origin/master'	2016-12-22 19:55:17 +01:00