Merge branch 'master' into master

This commit is contained in:
rcarteraz 2024-10-20 15:18:29 -07:00 committed by GitHub
commit 617a804114
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions

View file

@ -60,7 +60,7 @@ export const Faq = {
"apple": [
{
title: "What version of iOS/iPadOS/macOS does the Meshtastic App Require?",
content: `The Meshtastic App on Apple Clients require the following minimum OS versions: iOS 16.2, iPadOS 16.2, and macOS 13.`,
content: `The Meshtastic Apple app supports the last two major versions of iOS, iPadOS or macOS.`,
},
{
title: "How do I get the Apple Meshtastic App?",

View file

@ -66,6 +66,7 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
### Ontario
- [Mesht Ontario](https://t.me/meshtOnt)
- [Greater Ottawa Meshtastic Enthusiasts Discord](https://discord.gg/njcQ4BnKDU)
### Prince Edward Island
@ -114,6 +115,7 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
- [Mesh_ITA Discord Server](https://discord.gg/ETFmtyzbFT)
## Japan
- [Meshtastic Japan Community](https://www.facebook.com/share/g/BQCGxZhw9SxFQja8/?mibextid=K35XfP)
## Lithuania
@ -141,6 +143,7 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
- [Slovenian Amature Radio Discord](https://discord.gg/uHDDE734DD)
## Spain
- [Meshtastic Spanish Community](https://t.me/meshtastic_esp)
## Taiwan
@ -223,6 +226,7 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
- [Albuquerque Mesh](https://www.abqm.net)
### North Carolina
- [NCMesh](https://ncmesh.net)
### Ohio

View file

@ -97,7 +97,8 @@ const Firmware = (): JSX.Element => {
</div>
</div>
<div className="card__body">
Available on MacOS & iOS. Requires MacOS Ventura or iOS 16+.
Available on iOS, iPadOS and macOS. The last two major OS
versions are supported.
</div>
<div className="card__footer mt-auto">
<a