Merge branch 'bump-player-v2.6.0-e54d' into 'main'

Bump player to version v2.6.0 See merge request platformsh/observability/blackfire/blackfire.io!34000
blackfireio · May 6, 2024 · 370aeb9 · 370aeb9
2 parents 57c8622 + 5be8f58
commit 370aeb9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+* v2.6.0 (2024-05-06)
+
+  - Update dependencies
+  - Deprecate the samples attribute in .blackfire.yml file
+
 * v2.5.4 (2024-04-30)
 
   - Update dependencies

diff --git a/composer.json b/composer.json
@@ -77,7 +77,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev"
+            "dev-master": "2.6-dev"
         }
     }
 }