Commit 7fa7d31
committed
Merge branch 'master' of https://bitbucket.org/woosignal/dev-flutter-woocommerce-app into feature/WFA-2-api-customers
# Conflicts:
# example/.flutter-plugins
# example/.flutter-plugins-dependencies
# example/android/.gradle/5.6.2/executionHistory/executionHistory.bin
# example/android/.gradle/5.6.2/executionHistory/executionHistory.lock
# example/android/.gradle/5.6.2/fileHashes/fileHashes.bin
# example/android/.gradle/5.6.2/fileHashes/fileHashes.lock
# example/android/.gradle/5.6.2/fileHashes/resourceHashesCache.bin
# example/android/.gradle/5.6.2/javaCompile/classAnalysis.bin
# example/android/.gradle/5.6.2/javaCompile/jarAnalysis.bin
# example/android/.gradle/5.6.2/javaCompile/javaCompile.lock
# example/android/.gradle/5.6.2/javaCompile/taskHistory.bin
# example/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# example/android/.gradle/buildOutputCleanup/outputFiles.bin
# example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
# example/ios/Flutter/Generated.xcconfig
# example/ios/Flutter/flutter_export_environment.sh
# example/ios/Runner/GeneratedPluginRegistrant.m
# example/lib/main.dart
# example/pubspec.lock
# lib/woosignal.dartFile tree
29 files changed
+1604
-154
lines changed- .idea
- libraries
- example
- android
- .gradle
- 5.6.2
- executionHistory
- fileHashes
- javaCompile
- buildOutputCleanup
- app/src/main/java/io/flutter/plugins
- ios
- Flutter
- Runner
- lib
- lib
- models/response
29 files changed
+1604
-154
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
59 | 64 | | |
60 | 65 | | |
61 | 66 | | |
| |||
132 | 137 | | |
133 | 138 | | |
134 | 139 | | |
135 | | - | |
| 140 | + | |
| 141 | + | |
136 | 142 | | |
137 | 143 | | |
138 | 144 | | |
139 | 145 | | |
140 | 146 | | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
141 | 151 | | |
142 | 152 | | |
143 | 153 | | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
144 | 255 | | |
| 256 | + | |
| 257 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 commit comments