Merge changes from master into v1.0.0 #344
Closed
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
This is not intuitive compared to other linking syntax. Here are all the ways linking is supported: https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet#links
storage: fix link syntax
Update Gradle wrapper to 3.1
Pull latest changes
Database style cleanup
Blame it on copy&paste, this is a ListAdapter, not a RecyclerAdapter.
Minor nitpick in log message
Removed casting of inflated layout to ViewGroup
# Conflicts: # common/constants.gradle
|
We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm. |
|
I went and did this here: Thanks for the reminder that we hadn't merged |
|
As long as it gets done! Thanks. I changed the base branch of #309 and I'll merge v1.0.0 into the PR once I get home. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
There were no conflicts so this one should be easy.
Necessary for: #309 (comment)