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
..
dto	fixed getTransactionsToApprove (#12)	2016-12-22 10:19:21 +01:00
error	Implemented broadcastAndStore and sendTrytes	2016-12-18 12:33:26 +01:00
model	Merge remote-tracking branch 'origin/master'	2016-12-22 19:55:17 +01:00
pow	Implemented prepareTransfer and getInputs	2016-12-19 19:03:11 +01:00
utils	Implemented prepareTransfer and getInputs	2016-12-19 19:03:11 +01:00
IotaAPICommands.java	rerranged entries, optimized imports	2016-11-13 22:42:38 +01:00
IotaAPIProxy.java	added documentation	2016-12-22 19:34:31 +01:00
IotaAPIService.java	rerranged entries, optimized imports	2016-11-13 22:42:38 +01:00