Skip to content

Commit dd6d41f

Browse files
bruschillbruschill
committed
Merge remote-tracking branch 'upstream/main' into feat/import-device-config
# Conflicts: # Localizable.xcstrings # Meshtastic.xcodeproj/project.pbxproj # Meshtastic/Resources/docs/index.json
2 parents 5a3f977 + e2b6cec commit dd6d41f

247 files changed

Lines changed: 43631 additions & 20116 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.agents/skills/ios-marketing-capture/SKILL.md‎

Lines changed: 494 additions & 0 deletions
Large diffs are not rendered by default.

‎.claude/skills/ios-marketing-capture‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../.agents/skills/ios-marketing-capture

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,6 @@ fastlane/test_output
9292
iOSInjectionProject/
9393
**/secrets.json
9494
.mcp.json
95+
96+
# Marketing screenshot capture output (scripts/capture-marketing.sh)
97+
marketing/

‎CLAUDE.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<!-- SPECKIT START -->
22
For additional context about technologies to be used, project structure,
3-
shell commands, and other important information, read the current plan
3+
shell commands, and other important information, read the current plan:
4+
`specs/014-mesh-beacons/plan.md` (feature: Mesh Beacons).
45
<!-- SPECKIT END -->

0 commit comments

Comments
 (0)