Merge branch 'master' into signatures

ImperialOctopus · Oct 25, 2020 · fcdabac · fcdabac
2 parents a14e6d8 + 8c76182
commit fcdabac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,8 @@ doc/api/
 .pub-cache/
 .pub/
 
+**/lib/generated_plugin_registrant.dart
+
 # Android related
 **/android/**/gradle-wrapper.jar
 **/android/.gradle
@@ -68,6 +70,7 @@ doc/api/
 **/ios/Flutter/flutter_assets/
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
+**/ios/Flutter/flutter_export_environment.sh
 
 # Exceptions to above rules.
 !**/ios/**/default.mode1v3

diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart