Sebastian Gerske 2063530297 Merge remote-tracking branch 'origin/develop' into feature/secret_store ...

# Conflicts:
#	src/ocean/Ocean.ts
#	test/ocean/Asset.test.ts

2018-10-26 10:46:32 +02:00

..

Account.ts

adapted changes from squid discussion, updated interface definition

2018-10-18 13:06:52 +02:00

Asset.ts

adapted changes from squid discussion, updated interface definition

2018-10-18 13:06:52 +02:00

Ocean.ts

Merge remote-tracking branch 'origin/develop' into feature/secret_store

2018-10-26 10:46:32 +02:00

OceanBase.ts

new squid design

2018-10-16 14:56:18 +02:00

Order.ts

rename provider -> aquarius

2018-10-25 17:26:26 +02:00