David Racero 6cbcf39454 Fixed conflicts and merge changes		2020-09-15 17:24:50 +02:00
..
configuration	Merge and fix conflicts	2020-08-25 14:15:35 +02:00
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	Merge changes	2020-09-09 21:26:52 +02:00
openzeppelin-upgradeability	Updated libraries, renamed internal methods	2020-08-21 18:18:12 +02:00