Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🍒 Cherry pick PR #20291 to staging 🍒 #20329

Merged
merged 4 commits into from
Jun 7, 2023
Merged

🍒 Cherry pick PR #20291 to staging 🍒 #20329

merged 4 commits into from
Jun 7, 2023

Commits on Jun 6, 2023

  1. Merge pull request #20327 from Expensify/version-BUILD-FA17FBED-8016-… 

    …4831-A32B-21913E59A0D6

Update version to 1.3.25-3 on main

(cherry picked from commit 38272e9)
    @OSBotify
    OSBotify committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    ed9523a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #20291 from Expensify/Rory-UseMacos13 

    [No QA] Use macos-13 runners for desktop builds

(cherry picked from commit 6abef5f)
    @AndrewGable @OSBotify
    AndrewGable authored and OSBotify committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    1d25c31 View commit details
    Browse the repository at this point in the history

  3. Resolve conflicts

    @roryabraham
    roryabraham committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    6898227 View commit details
    Browse the repository at this point in the history

  4. Fix bad merge

    @roryabraham
    roryabraham committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    3fbda1e View commit details
    Browse the repository at this point in the history