Merge branch 'main' into release/v1.0.x

fluxcd · May 9, 2024 · 519df15 · 519df15
2 parents cee9953 + f88b3be
commit 519df15
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/.github/labels.yaml b/.github/labels.yaml
@@ -13,8 +13,6 @@
 - name: area/oci
   description: OCI related issues and pull requests
   color: '#c739ff'
-
-# TODO: enable this when we have a release/v1.0.x branch
-#- name: backport:release/v1.0.x
-#  description: To be backported to release/v1.0.x
-#  color: '#ffd700'
+- name: backport:release/v1.0.x
+  description: To be backported to release/v1.0.x
+  color: '#ffd700'