Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[google_sign_in] Fix merge mistake. #3153

Merged
merged 1 commit into from
Oct 14, 2020
Merged

[google_sign_in] Fix merge mistake. #3153

merged 1 commit into from
Oct 14, 2020

Conversation

cyanglaz
Copy link
Contributor

@cyanglaz cyanglaz commented Oct 14, 2020

Fix a merge mistake in https://github.com/flutter/plugins/pull/3042/files?file-filters%5B%5D=.md where the CHANGELOG message was erased.

@cyanglaz cyanglaz requested a review from mehmetf as a code owner October 14, 2020 21:08
@google-cla google-cla bot added the cla: yes label Oct 14, 2020
Copy link
Contributor

@amirh amirh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RSLGTM

@cyanglaz cyanglaz merged commit fe9dc22 into flutter:master Oct 14, 2020
@cyanglaz cyanglaz deleted the fix branch October 14, 2020 21:12
blasten pushed a commit that referenced this pull request Oct 15, 2020
* Android Code Inspection and Clean up (#3117)

* [in_app_purchase] Android Code Inspection and Clean up (#3120)

* Android Code Inspection and Clean up

* Format

* [video_player] Fix SSLProtocolException for low API version (#3122)

* [camera] Set audio encoding bitrate when recording video (#3124)

Fixes flutter/flutter#38787

* Fix links in package example readmes (#3130)

http://flutter.io/ -> https://flutter.dev/

* [integration_test] Add watchPerformance (#3116)

* add watchPerformance

* [wifi_info_flutter] [wifi_info_flutter_platform_interface] Initial commit for `wifi_info_flutter` plugin and platform interface (#3129)

* [video_player] fix Timer Leak (#3119)

* [in_app_purchase] Add example test target to Podfile, add OCMock dependency (#3145)

* Add linux directory to examples (#3064)

When Linux support was added to these plugins, the app template wasn't
yet stabilized, so was not checked in. Now that it is stable, this adds
them so that the plugin_tools workaround that created them on each run
can be removed.

Other than CHANGELOG.md updates and updating the verison in
pubspec.yaml, this is purely the result of running 'flutter create .' in
the example/ folders and adding the resulting linux/ directories.

* [wifi_info_flutter_plugin_interface] implement wifi platform interface (#3134)

* [share] Replace deprecated Environment.getExternalStorageDirectory() call on Android. (#3152)

* Android API 29 & 30

* Update Version

* Update android sdk version to 29 for all mobile plugins. (#3042)

* [google_sign_in]  fix merge error in CHANGELOG (#3153)

Co-authored-by: Hamdi Kahloun <32666446+hamdikahloun@users.noreply.github.com>
Co-authored-by: Maurits van Beusekom <maurits@baseflow.com>
Co-authored-by: Kevin Moore <kevmoo@users.noreply.github.com>
Co-authored-by: Ming Lyu (CareF) <minglyu@google.com>
Co-authored-by: Maurice Parrish <bmparr@google.com>
Co-authored-by: creativecreatorormaybenot <creativecreatorormaybenot@gmail.com>
Co-authored-by: Jenn Magder <magder@google.com>
Co-authored-by: stuartmorgan <stuartmorgan@google.com>
Co-authored-by: Chris Yang <ychris@google.com>
FlutterSu pushed a commit to FlutterSu/flutter-plugins that referenced this pull request Nov 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants