1
0
mirror of https://github.com/flutter/samples.git synced 2025-11-08 13:58:47 +00:00
Commit Graph

107 Commits

Author SHA1 Message Date
Brett Morgan
bee21b55e6 Cleaning up Veggie Seasons (#2416)
## Pre-launch Checklist

- [x] I read the [Flutter Style Guide] _recently_, and have followed its
advice.
- [x] I signed the [CLA].
- [x] I read the [Contributors Guide].
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-devrel
channel on [Discord].

<!-- Links -->
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md
[CLA]: https://cla.developers.google.com/
[Discord]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
[Contributors Guide]:
https://github.com/flutter/samples/blob/main/CONTRIBUTING.md
2024-08-30 15:24:59 -04:00
Brett Morgan
11d1e98370 Update veggieseasons Runners (#2411)
This PR updates `veggieseasons` to use current Runners for iOS and macOS

## Pre-launch Checklist

- [x] I read the [Flutter Style Guide] _recently_, and have followed its
advice.
- [x] I signed the [CLA].
- [x] I read the [Contributors Guide].
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-devrel
channel on [Discord].

<!-- Links -->
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md
[CLA]: https://cla.developers.google.com/
[Discord]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
[Contributors Guide]:
https://github.com/flutter/samples/blob/main/CONTRIBUTING.md
2024-08-29 14:39:56 +10:00
Seth Ladd
f4e92d710d Update font to match Cupertino (#2410)
updating font to more closely align with system font

*List which issues are fixed by this PR. For larger changes, raising an
issue first helps
reduce redundant work.*

## Pre-launch Checklist

- [x] I read the [Flutter Style Guide] _recently_, and have followed its
advice.
- [x] I signed the [CLA].
- [ ] I read the [Contributors Guide].
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [ ] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-devrel
channel on [Discord].

<!-- Links -->
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md
[CLA]: https://cla.developers.google.com/
[Discord]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
[Contributors Guide]:
https://github.com/flutter/samples/blob/main/CONTRIBUTING.md
2024-08-29 10:59:36 +10:00
Kevin Moore
a858f4701e Bump deps and min SDKs, move web apps to new bootstrapping logic (#2292)
Also removed the web measurement experiment from the material 3 demo
2024-05-14 22:33:41 -07:00
Soroush Beigi
1f31580907 Updating samples Dart sdk to the last stable version (#2209) 2024-03-24 21:29:55 +11:00
Brett Morgan
9e236813fe Fixups for master CI (#2118)
## Pre-launch Checklist

- [x] I read the [Flutter Style Guide] _recently_, and have followed its
advice.
- [x] I signed the [CLA].
- [x] I read the [Contributors Guide].
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-devrel
channel on [Discord].

<!-- Links -->
[Flutter Style Guide]:
https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[CLA]: https://cla.developers.google.com/
[Discord]: https://github.com/flutter/flutter/wiki/Chat
[Contributors Guide]:
https://github.com/flutter/samples/blob/main/CONTRIBUTING.md
2023-12-21 15:30:25 +10:00
dependabot[bot]
7ff2235120 Bump intl from 0.18.1 to 0.19.0 in /veggieseasons (#2109)
Bumps [intl](https://github.com/dart-lang/i18n/tree/main/pkgs) from 0.18.1 to 0.19.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/dart-lang/i18n/releases">intl's releases</a>.</em></p>
<blockquote>
<h2>package:intl v0.19.0</h2>
<ul>
<li>Update to CLDR v44.</li>
<li>Update to CLDR v43.</li>
<li>Add <code>tryParse</code> to NumberFormat.</li>
<li>Add <code>tryParse</code> <code>tryParseStrict</code> <code>tryParseLoose</code> <code>tryParseUtc</code> to DateFormat.</li>
<li>Switch QAR currency name to Riyal.</li>
<li>Add license headers to some files.</li>
<li>Update CVE currency symbol.</li>
<li>Add <code>EEEEE</code> skeleton for <code>DateFormat</code>, closing <a href="https://redirect.github.com/dart-lang/i18n/issues/176">#176</a>.</li>
<li>Switch to <code>3.0.0</code> SDK.</li>
<li>Fix issue <a href="https://redirect.github.com/dart-lang/i18n/issues/483">#483</a> about date parsing with a <code>yy</code> skeleton.</li>
<li>Extract <code>NumberParserBase</code> abstract class</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="a1431f82d6"><code>a1431f8</code></a> Switch changelog entries</li>
<li><a href="bd86e2723a"><code>bd86e27</code></a> Merge branch 'main' into publishIntl</li>
<li><a href="5043160a82"><code>5043160</code></a> No public description</li>
<li><a href="2d75d73fd0"><code>2d75d73</code></a> Publish <code>package:intl</code> v0.19.0</li>
<li><a href="412ef68964"><code>412ef68</code></a> No public description</li>
<li><a href="2c82cd2bd0"><code>2c82cd2</code></a> Dissolve <code>package:messages_deserializer</code> for pub publish (<a href="https://github.com/dart-lang/i18n/tree/main/pkgs/issues/751">#751</a>)</li>
<li><a href="f02f7484b6"><code>f02f748</code></a> Fixes before publish (<a href="https://github.com/dart-lang/i18n/tree/main/pkgs/issues/749">#749</a>)</li>
<li><a href="c782918d84"><code>c782918</code></a> Last fixes</li>
<li><a href="2da7748e0f"><code>2da7748</code></a> More fixes</li>
<li><a href="7315909c2a"><code>7315909</code></a> Reformat</li>
<li>Additional commits viewable in <a href="https://github.com/dart-lang/i18n/commits/intl-v0.19.0/pkgs">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=intl&package-manager=pub&previous-version=0.18.1&new-version=0.19.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

</details>
2023-12-08 07:43:23 +00:00
Brett Morgan
0ccc283a4e Fixup for failing Beta CI (#2092)
Turns out, we shipped a new Flutter beta as well. 

Commenting out `experimental/varfont_shader_puzzle` from beta CI

Everything else is just cleanup.

## Pre-launch Checklist

- [x] I read the [Flutter Style Guide] _recently_, and have followed its
advice.
- [x] I signed the [CLA].
- [x] I read the [Contributors Guide].
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-devrel
channel on [Discord].

<!-- Links -->
[Flutter Style Guide]:
https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[CLA]: https://cla.developers.google.com/
[Discord]: https://github.com/flutter/flutter/wiki/Chat
[Contributors Guide]:
https://github.com/flutter/samples/blob/main/CONTRIBUTING.md
2023-11-16 14:48:50 +10:00
Brett Morgan
7d169b4d98 Update for 3.13 stable (#1992) 2023-08-24 11:52:33 -05:00
Brett Morgan
f1fd4341ff Flutter beta (#1952) 2023-08-17 06:26:43 +10:00
Miguel Beltran
715c4338f6 adding more named and explicit imports (#1909) 2023-06-28 06:27:20 +10:00
Miguel Beltran
93db48966c Explicit import for Platform and kIsWeb (#1898)
Following the ideas in flutter/website#7798 I have changed the imports
needed for Platform and kIsWeb to be explicitly named.

## Pre-launch Checklist

- [ ] I read the [Flutter Style Guide] _recently_, and have followed its
advice.
- [ ] I signed the [CLA].
- [ ] I read the [Contributors Guide].
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [ ] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-devrel
channel on [Discord].

<!-- Links -->
[Flutter Style Guide]:
https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[CLA]: https://cla.developers.google.com/
[Discord]: https://github.com/flutter/flutter/wiki/Chat
[Contributors Guide]:
https://github.com/flutter/samples/blob/main/CONTRIBUTING.md
2023-06-23 13:24:11 +10:00
Parker Lougheed
8d7ac67bc1 veggieseasons: Pin go_router version (#1840)
Investigating https://github.com/flutter/samples/issues/1838

---------

Co-authored-by: Brett Morgan <brettmorgan@google.com>
2023-05-25 17:59:03 +10:00
Brett Morgan
82e38e5b79 Update samples for Dart 3.0.0 (#1803) 2023-05-11 12:48:09 +10:00
Brett Morgan
36e7a6ab04 Update for Flutter 3.10 beta (#1746)
## Pre-launch Checklist

- [x] I read the [Flutter Style Guide] _recently_, and have followed its
advice.
- [x] I signed the [CLA].
- [x] I read the [Contributors Guide].
- [x] I updated/added relevant documentation (doc comments with `///`).
- [ ] All existing and new tests are passing.

---------

Co-authored-by: David Iglesias <ditman@gmail.com>
Co-authored-by: Mark Thompson <2554588+MarkTechson@users.noreply.github.com>
Co-authored-by: John Ryan <ryjohn@google.com>
2023-05-11 06:16:31 +10:00
dependabot[bot]
33bcb165b9 Bump go_router from 6.5.9 to 7.0.0 in /veggieseasons (#1762)
Bumps
[go_router](https://github.com/flutter/packages/tree/main/packages) from
6.5.9 to 7.0.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="b01736711c"><code>b017367</code></a>
[go_router] Cleans up route match API and introduces dart fix (<a
href="https://github.com/flutter/packages/tree/main/packages/issues/3819">#3819</a>)</li>
<li><a
href="2f95ecda81"><code>2f95ecd</code></a>
[camerax] Add <code>LifecycleOwner</code> Proxy (<a
href="https://github.com/flutter/packages/tree/main/packages/issues/3837">#3837</a>)</li>
<li><a
href="815cfca847"><code>815cfca</code></a>
[file_selector] Add getDirectoryPaths implementation for Windows (<a
href="https://github.com/flutter/packages/tree/main/packages/issues/3704">#3704</a>)</li>
<li><a
href="6dc28c9c3f"><code>6dc28c9</code></a>
[various] Update Android example min SDKs (<a
href="https://github.com/flutter/packages/tree/main/packages/issues/3847">#3847</a>)</li>
<li><a
href="1a90429ac1"><code>1a90429</code></a>
[camerax] Implement Image Streaming (<a
href="https://github.com/flutter/packages/tree/main/packages/issues/3454">#3454</a>)</li>
<li><a
href="124e330a2b"><code>124e330</code></a>
[various] update agp and gradle for all examples in packages (<a
href="https://github.com/flutter/packages/tree/main/packages/issues/3822">#3822</a>)</li>
<li><a
href="c71747df2c"><code>c71747d</code></a>
Update xcode to 14c18 (<a
href="https://github.com/flutter/packages/tree/main/packages/issues/3774">#3774</a>)</li>
<li><a
href="3dc59f914d"><code>3dc59f9</code></a>
[camera_android] Add NV21 as an image stream format <a
href="https://github.com/flutter/packages/tree/main/packages/issues/3277">#3277</a>
(<a
href="https://github.com/flutter/packages/tree/main/packages/issues/3639">#3639</a>)</li>
<li>See full diff in <a
href="https://github.com/flutter/packages/commits/go_router-v7.0.0/packages">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=go_router&package-manager=pub&previous-version=6.5.9&new-version=7.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Brett Morgan <brettmorgan@google.com>
2023-05-02 13:15:20 +10:00
dependabot[bot]
b72ff44853 Bump flutter_launcher_icons from 0.12.0 to 0.13.0 in /veggieseasons (#1731) 2023-04-10 18:42:05 +10:00
Brett Morgan
e3ca775b27 simple_shader: Clean up shaders/simple.frag, rebuild runners (#1715) 2023-03-31 08:37:23 +10:00
Brett Morgan
3bafa557f7 Update sdk constraint range and update runners (#1706) 2023-03-23 18:13:59 +10:00
dependabot[bot]
ea09fa9e42 Bump flutter_launcher_icons from 0.11.0 to 0.12.0 in /veggieseasons (#1677) 2023-02-27 16:11:36 +11:00
Miguel Beltran
8c06626190 Migrate veggieseasons to go_router (#1544)
* add go_router

* wip migration to go_router

* small fixes

* home screen cleanup

* remove unused

* small fixes

* details should be fullscreen dialog

* remove comment

* fix navigation outside the shell by using the correct navigation keys

* add restoration id to all pages

* test passing, but parts are commented out, wip

* uncommented more test code

* Add TODOs

* fix lint issues

* fix tests

* use FadeTransitionPage

* remove unnecessary builders

* FadeTransitionPage same as CustomTransitionPage

* add comments regarding relative routes

* add missing pageKey

* add missing const

---------

Co-authored-by: Brett Morgan <brettmorgan@google.com>
2023-02-24 08:18:03 +01:00
Brett Morgan
3e9bb78aec Create analysis_defaults package (#1654)
* Create `analysis_defaults` package

* Update analysis_defaults/pubspec.yaml

Co-authored-by: Pierre-Louis <6655696+guidezpl@users.noreply.github.com>

---------

Co-authored-by: Pierre-Louis <6655696+guidezpl@users.noreply.github.com>
2023-02-16 23:44:16 +10:00
gaaclarke
787bf09fe3 Add background_isolate_channels to CI (#1448)
* Added sample code for using plugins and channels from background isolates.

* goderbauer feedback 1

* goderbauer feedback2

* goderbauer feedback 3

* Add `background_isolate_channels` to CI

* Comment in `background_isolate_channels`

* Fixup

* Elide `experimental/material_3_demo` from `master`

* Elide `material_3_demo` from `master` CI

* Elide `place_tracker` on `master` CI

---------

Co-authored-by: Brett Morgan <brettmorgan@google.com>
Co-authored-by: Brett Morgan <brett.morgan@gmail.com>
2023-02-06 13:20:05 +10:00
dependabot[bot]
f66188c862 Bump intl from 0.17.0 to 0.18.0 in /veggieseasons (#1527) 2022-12-15 19:13:09 +11:00
dependabot[bot]
f8117cc885 Bump flutter_launcher_icons from 0.10.0 to 0.11.0 in /veggieseasons (#1503)
Bumps [flutter_launcher_icons](https://github.com/fluttercommunity/flutter_launcher_icons) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/fluttercommunity/flutter_launcher_icons/releases)
- [Changelog](https://github.com/fluttercommunity/flutter_launcher_icons/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fluttercommunity/flutter_launcher_icons/compare/v0.10.0...v0.11.0)

---
updated-dependencies:
- dependency-name: flutter_launcher_icons
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-17 18:14:33 +11:00
dependabot[bot]
3c1d3a4976 Bump flutter_launcher_icons from 0.9.3 to 0.10.0 in /veggieseasons (#1367)
Bumps [flutter_launcher_icons](https://github.com/fluttercommunity/flutter_launcher_icons) from 0.9.3 to 0.10.0.
- [Release notes](https://github.com/fluttercommunity/flutter_launcher_icons/releases)
- [Changelog](https://github.com/fluttercommunity/flutter_launcher_icons/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fluttercommunity/flutter_launcher_icons/compare/v0.9.3...v0.10.0)

---
updated-dependencies:
- dependency-name: flutter_launcher_icons
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-08 18:02:17 +10:00
Brett Morgan
4af443d33f Drop lock files from repo (#1282) 2022-05-28 07:01:26 +10:00
Brett Morgan
58bc5d7a58 Deps update, utilize super.key (#1265)
* Deps update, utilize `super.key`

* `flutter format`
2022-05-13 12:31:56 -07:00
Brett Morgan
ccd68f34e2 Beta (#1234) 2022-05-11 12:48:11 -07:00
dependabot[bot]
8ad9de6146 Bump shared_preferences from 2.0.13 to 2.0.14 in /veggieseasons (#1242)
Bumps [shared_preferences](https://github.com/flutter/plugins) from 2.0.13 to 2.0.14.
- [Release notes](https://github.com/flutter/plugins/releases)
- [Commits](https://github.com/flutter/plugins/compare/shared_preferences-v2.0.13...shared_preferences-v2.0.14)

---
updated-dependencies:
- dependency-name: shared_preferences
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 03:18:17 -07:00
Brett Morgan
63235a729a Update pubspec.lock and friends (#1076) 2022-04-20 07:31:26 +10:00
Brett Morgan
3b46646306 flutter pub upgrade --major-versions (#1061) 2022-04-06 11:45:20 +10:00
Brett Morgan
a481c264cd Remove git:// url, update deps, fix destop_photo_search (#1052) 2022-03-19 08:37:04 +10:00
Miguel Beltran
03dbbcd667 Add window setup to veggie seasons (#1049) 2022-03-09 18:04:46 +11:00
Brett Morgan
26d88f1799 Update pubspec.yaml files (#971) 2022-01-05 10:43:14 +10:00
Brett Morgan
5b0a6be873 Drop DEVELOPMENT_TEAM (#975) 2022-01-05 06:29:30 +11:00
Andrew Brogdon
664b63c03c Updates for 2.8! (#961) 2021-12-09 13:15:57 +10:00
Brett Morgan
be34b0bf43 Centralize analysis options (#957) 2021-12-01 16:49:51 +10:00
Brett Morgan
84e7057abe Update pubspec.yaml files (#958) 2021-12-01 09:33:28 +10:00
Ahmed Ashour
29339b8334 Remove unneeded types (#949) 2021-11-03 09:58:12 -07:00
Brett Morgan
e2b77a4bf1 flutter pub upgrade (#931) 2021-10-13 10:18:41 -07:00
Brett Morgan
ac2bef7d83 veggieseasons: Migrate to null safety (#922) 2021-10-11 16:27:54 -07:00
Brett Morgan
994cdb4afa flutter pub upgrade (#926)
* flutter pub upgrade

* `desktop_photo_search`: Remove unneeded `unawaited`

Co-authored-by: John Ryan <ryjohn@google.com>
2021-10-11 14:01:27 -07:00
Brett Morgan
e2e2713986 Enforce use_key_in_widget_constructors and file_names lints (#913)
* Start enforcing use_key_in_widget_constructors and file_names lints

* dart format

* analysis fixes

* analysis fixes, pt2

* analysis fixes, part 3

* Revert platform_design (test failure)

* More reverts

* Notate why we aren't enforcing a lint
2021-10-08 14:30:28 -07:00
Brett Morgan
297f6b0b96 Upgrade deps, format, fix web/filipino_cuisine (#898)
fixes: https://github.com/flutter/samples/issues/897
2021-09-21 11:38:59 -07:00
Andrew Brogdon
4cac0e6661 Lands beta branch into master for 2.5 (#895) 2021-09-08 17:35:05 -07:00
Andrew Brogdon
3b65403631 Update README.md (#853)
Probably shouldn't have the README mention a widget that no longer exists.
2021-07-14 16:56:11 -07:00
Brett Morgan
a405fc4a9d Update the dependencies (#815) 2021-06-08 08:15:43 +10:00
Brett Morgan
936d1fdaae Upgrading samples to flutter_lints, part 1 of n (#804) 2021-06-05 12:24:28 +10:00
Andrew Brogdon
376c666f0a Merge beta into master (#799) 2021-05-18 13:35:06 -07:00