David Racero 6cbcf39454 Fixed conflicts and merge changes		2020-09-15 17:24:50 +02:00
..
configuration
helpers	Added missing whenNotPaused to new functions. Changed IS_PAUSED error code to 58 to prevent error collision. Added new pausable tests.	2020-09-15 13:13:28 +02:00
logic	Fixed conflicts and merge changes	2020-09-15 17:24:50 +02:00
math
openzeppelin-upgradeability