4 Commits

Author	SHA1	Message	Date
Sebastian Gerske	ee1dd8e30b	Merge remote-tracking branch 'origin/feature/search' into feature/secret_store ... # Conflicts: # src/models/Config.ts # src/ocean/Ocean.ts # test/config.ts # test/keeper/ContractBase.test.ts # test/keeper/ContractHandler.test.ts # test/keeper/Keeper.test.ts # test/ocean/Account.test.ts # test/ocean/Asset.test.ts # test/ocean/Ocean.test.ts # test/ocean/Order.test.ts	2018-10-26 12:14:49 +02:00
Sebastian Gerske	192eecc3ae	added searchAssets	2018-10-26 10:40:46 +02:00
Sebastian Gerske	28fe11e671	adapt test config	2018-10-25 17:18:33 +02:00
Sebastian Gerske	19201ef6e7	new squid design	2018-10-16 14:56:18 +02:00