From 990745aba36d61409d51a9a2bc8836a450600e18 Mon Sep 17 00:00:00 2001
From: Zakhar Kozlov <inspired.incredible@gmail.com>
Date: Fri, 21 Apr 2023 13:49:15 +0200
Subject: [PATCH] release v1.18.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 ad227fb03f6..a2abcaebacc 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.18.0](https://github.com/ajaxorg/ace/compare/v1.17.0...v1.18.0) (2023-04-21)
+
+
+### Features
+
+* marker groups ([#5113](https://github.com/ajaxorg/ace/issues/5113)) ([01d4605](https://github.com/ajaxorg/ace/commit/01d4605c0dcf7bcbb4f1a09a243f7ef6d16d7d43))
+* summary of annotations in folded lines ([#5117](https://github.com/ajaxorg/ace/issues/5117)) ([dc63ba9](https://github.com/ajaxorg/ace/commit/dc63ba900d3641284d7d11cbb5ccad7c3039f3a4))
+
 ## [1.17.0](https://github.com/ajaxorg/ace/compare/v1.16.0...v1.17.0) (2023-04-12)
 
 
diff --git a/build b/build
index 0a07fb082b4..d37df561f01 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit 0a07fb082b48d26cd561ad96e1c76941a4d55c39
+Subproject commit d37df561f010a90a740300e593f8536d3435393c
diff --git a/package.json b/package.json
index 0054cc95b55..4fd6ba66422 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.17.0",
+    "version": "1.18.0",
     "homepage": "http://github.com/ajaxorg/ace",
     "engines": {
         "node": ">= 0.6.0"
diff --git a/src/config.js b/src/config.js
index c63d06ab985..9f07f67f41b 100644
--- a/src/config.js
+++ b/src/config.js
@@ -156,6 +156,6 @@ var reportErrorIfPathIsNotConfigured = function() {
     }
 };
 
-exports.version = "1.17.0";
+exports.version = "1.18.0";