Commit c53a421
committed
Merge branch 'master' into v4.0.0
# Conflicts:
# CHANGELOG.md
# example/lib/indicators/check_mark_indicator.dart
# example/lib/indicators/envelope_indicator.dart
# example/lib/indicators/plane_indicator.dart
# example/lib/indicators/swipe_action.dart
# example/lib/screens/presentation_screen.dart
# example/lib/widgets/web_frame.dart
# lib/src/custom_refresh_indicator.dart
# lib/src/delegates/material_indicator_delegate.dart
# lib/src/widgets/custom_material_indicator.dart
# pubspec.yaml3 files changed
+5
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
25 | 28 | | |
26 | 29 | | |
27 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
0 commit comments