tree 0b3f157f94198824f733ebedf911ead2d142de40
parent 6985f6b08bc86d5d448aa7c06d694a0224160a32
parent f3664b839a8e988d773a0ddccbab3fe59dbc89cd
author Robert Nystrom <rnystrom@google.com> 1571680480 -0700
committer Robert Nystrom <rnystrom@google.com> 1571680480 -0700

Merge branch 'master' into dropped-comma

# Conflicts:
#	CHANGELOG.md
#	pubspec.yaml