From cedecd2753c4baa0d879b254f001b4246ce4d58d Mon Sep 17 00:00:00 2001
From: Roberto Dip <rroperzh@gmail.com>
Date: Mon, 19 Aug 2024 12:35:05 -0300
Subject: [PATCH] Release fleetd 1.31.0

---
 .github/workflows/generate-desktop-targets.yml | 2 +-
 orbit/CHANGELOG.md                             | 4 ++++
 orbit/changes/21381-fv                         | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 orbit/changes/21381-fv

diff --git a/.github/workflows/generate-desktop-targets.yml b/.github/workflows/generate-desktop-targets.yml
index e3835a9ac26f..5aa8af2f7e49 100644
--- a/.github/workflows/generate-desktop-targets.yml
+++ b/.github/workflows/generate-desktop-targets.yml
@@ -24,7 +24,7 @@ defaults:
     shell: bash
 
 env:
-  FLEET_DESKTOP_VERSION: 1.30.0
+  FLEET_DESKTOP_VERSION: 1.31.0
 
 permissions:
   contents: read
diff --git a/orbit/CHANGELOG.md b/orbit/CHANGELOG.md
index b6f9278baa38..f326b204e309 100644
--- a/orbit/CHANGELOG.md
+++ b/orbit/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Orbit 1.31.0 (Aug 19, 2024)
+
+* Fixed an issue that would display a disk encryption modal with MDM configured and FileVault enabled if the user hadn't escrowed the key in the past.
+
 ## Orbit 1.30.0 (Aug 05, 2024)
 
 * Use Escrow Buddy to rotate FileVault keys on macOS
diff --git a/orbit/changes/21381-fv b/orbit/changes/21381-fv
deleted file mode 100644
index 942f2f435f55..000000000000
--- a/orbit/changes/21381-fv
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed an issue that would display a disk encryption modal with MDM configured and FileVault enabled if the user hadn't escrowed the key in the past.