From 0d55d860d8ad22e1085accedccfe74387b0904c8 Mon Sep 17 00:00:00 2001
From: Hakase <hakase@hakase.app>
Date: Sat, 25 Apr 2020 19:54:38 +0900
Subject: [PATCH] Release - v1.18.0

---
 .hgtags                    |  1 +
 docs/xml/nginx/changes.xml | 14 ++++++++++++++
 src/core/nginx.h           |  4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.hgtags b/.hgtags
index f76fc20..9c97bf4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -449,3 +449,4 @@ e56295fe0ea76bf53b06bffa77a2d3a9a335cb8c release-1.17.7
 fdacd273711ddf20f778c1fb91529ab53979a454 release-1.17.8
 5e8d52bca714d4b85284ddb649d1ba4a3ca978a8 release-1.17.9
 c44970de01474f6f3e01b0adea85ec1d03e3a5f2 release-1.17.10
+f8052414dbe9453578a9f6e753eb507be709c35a release-1.18.0
diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index ada3f84..9ed7769 100644
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -5,6 +5,20 @@
 <change_log title="nginx">
 
 
+<changes ver="1.18.0" date="2020-04-21">
+
+<change>
+<para lang="ru">
+Стабильная ветка 1.18.x.
+</para>
+<para lang="en">
+1.18.x stable branch.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="1.17.10" date="2020-04-14">
 
 <change type="feature">
diff --git a/src/core/nginx.h b/src/core/nginx.h
index c44c9aa..6f4d48b 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1017011
-#define NGINX_VERSION      "1.17.11"
+#define nginx_version      1018000
+#define NGINX_VERSION      "1.18.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION " by Hakase"
 
 #ifndef NGINX_SERVER