Gerardo Nardelli 71ea58f758 Merge branch 'master' into feat/uniswap-adapter-flashloan ... # Conflicts: # test/__setup.spec.ts		2020-11-25 10:46:01 -03:00
..
adapters	Refactor to avoid leftovers on _swapAndRepay with flash loan	2020-11-25 10:44:50 -03:00
dependencies/openzeppelin	Removed the ^ on solidity version	2020-11-20 11:45:20 +01:00
deployments	Replaced borrows with debt in comments and the InterestRateStrategy contract	2020-11-23 18:52:52 +01:00
flashloan	Removed the ^ on solidity version	2020-11-20 11:45:20 +01:00
interfaces	Merge branch 'master' into feat/uniswap-adapter-flashloan	2020-11-25 10:46:01 -03:00
misc	Removed reserveLogic import from WETHGateway	2020-11-24 17:07:47 +01:00
mocks	Merge branch 'master' into feat/uniswap-adapter-flashloan	2020-11-25 10:46:01 -03:00
protocol	Removed space in comments	2020-11-25 13:45:52 +01:00