Commit b50c015f authored by Collin Jackson's avatar Collin Jackson

Merge remote-tracking branch 'origin/master' into pinch

Conflicts:
	examples/widgets/scale.dart
parents 97b25712 d602589d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment