From 4befc2c53fe2d178c56a774bfb161794743daa09 Mon Sep 17 00:00:00 2001
From: Alice Koreman <a.koreman@outlook.com>
Date: Wed, 21 Aug 2024 17:05:20 +0200
Subject: [PATCH] release v1.36.0

---
 CHANGELOG.md  | 8 ++++++++
 build         | 2 +-
 package.json  | 2 +-
 src/config.js | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f447529843..09a05c5b5c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.36.0](https://github.com/ajaxorg/ace/compare/v1.35.5...v1.36.0) (2024-08-21)
+
+
+### Features
+
+* allow setting marker type for MarkerGroups ([#5630](https://github.com/ajaxorg/ace/issues/5630)) ([214df9c](https://github.com/ajaxorg/ace/commit/214df9cea8d729f3071f9c02889cba2b2e7051b3))
+* **forced-color:** do not adjust the forced colors for the editor ([#5624](https://github.com/ajaxorg/ace/issues/5624)) ([c8f9df8](https://github.com/ajaxorg/ace/commit/c8f9df84e70ee29e8e989966985bcea95a9bef9b))
+
 ### [1.35.5](https://github.com/ajaxorg/ace/compare/v1.35.4...v1.35.5) (2024-08-20)
 
 ### [1.35.4](https://github.com/ajaxorg/ace/compare/v1.35.3...v1.35.4) (2024-07-22)
diff --git a/build b/build
index b25740e15d1..3945babc14c 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit b25740e15d1309382bfff84f6a6ec1918d4707e1
+Subproject commit 3945babc14cf72919658c9ca37349d6411e2a94c
diff --git a/package.json b/package.json
index 074e6a0e797..c8b5856fb92 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "ace-code",
     "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
-    "version": "1.35.5",
+    "version": "1.36.0",
     "homepage": "http://github.com/ajaxorg/ace",
     "engines": {
         "node": ">= 0.6.0"
diff --git a/src/config.js b/src/config.js
index a8704fd949f..7777216d3a0 100644
--- a/src/config.js
+++ b/src/config.js
@@ -194,6 +194,6 @@ var reportErrorIfPathIsNotConfigured = function() {
     }
 };
 
-exports.version = "1.35.5";
+exports.version = "1.36.0";