Merging master into dev 2.2.0 #634
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adding Circle CI to master
[CLI] Dividend fixes
VRTM audit fixes
[CLI] Keep transfer_manager compatible with GTM v1.0.0
docs update & minor improvements
Dev-2.1.0 to master
* added enum TimeUnit * update depends on timeUnit * test for monthly checkpoint * tests for monthly checkpoint * use UTC instead of local time * minor fix * Tests for yearly checkpoint * Tests for last day of month * Updated tests for last day of month * commented failed test * fix for end of month schedule * refactored _update function * added TimeUnits: DAYS, WEEKS
* Add getTokensByDelegate * Simple check * Add more test cases * Add interface file * minor fix
|
I looked through the Solidity changes and looks good to me. |
adamdossa
approved these changes
Apr 9, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
the-little-merge is a copy of dev-2.2.0 rebased on the master branch.
Master branch contains all dev-2.1.0 changes so this merges 2.1.0 into 2.2.0 as well.
This was a clean rebase so everything should work perfectly.