summaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2021-12-24 15:53:59 +0300
committerRuslan Ermilov <ru@nginx.com>2021-12-24 15:53:59 +0300
commitfa4da058549d122387f5d553b62b0ec15b84ddc8 (patch)
treedb7b2f8666f24e805b4e5c13c021b0f6cac9dbd6 /src/core
parent3341a850763eec48263a4ab2fd3a35008b11da3e (diff)
parent363505e806feebb7ceb1f9edb0e3f75c1253384f (diff)
downloadnginx-fa4da058549d122387f5d553b62b0ec15b84ddc8.tar.gz
nginx-fa4da058549d122387f5d553b62b0ec15b84ddc8.tar.bz2
Merged with the default branch.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/nginx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h
index bc4af23af..5ad6aff45 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
#define _NGINX_H_INCLUDED_
-#define nginx_version 1021004
-#define NGINX_VERSION "1.21.4"
+#define nginx_version 1021005
+#define NGINX_VERSION "1.21.5"
#define NGINX_VER "nginx/" NGINX_VERSION
#ifdef NGX_BUILD