weilu d36a12a9c6 Merge remote-tracking branch 'upstream/master' into dev ...

# Conflicts:
#	android/build.gradle
#	android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScanPlugin.kt
#	example/.gitignore
#	example/android/app/src/main/AndroidManifest.xml
#	example/android/gradle.properties
#	pubspec.yaml

2020-04-10 13:43:52 +08:00

..

Flutter

flutter sdk 1.12.13

2019-12-20 15:18:16 +08:00

Runner

Initial commit

2017-10-29 10:05:11 -07:00

Runner.xcodeproj

Owner changes:

2020-02-19 23:19:14 +01:00

Runner.xcworkspace

Fix for Issue #61

2019-12-16 20:59:07 +01:00

.gitignore

Owner changes:

2020-02-19 23:19:14 +01:00

Podfile

Rewrote iOS scanner in ObjC to avoid swift plugin conflicts with use_frameworks!

2017-11-07 18:27:25 -08:00