From c28664849422c26958b377886a8dfc22df11f4d3 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 23 Apr 2019 15:48:26 +0300
Subject: [PATCH] release version 2.0.18

---
 framework/BaseYii.php  | 2 +-
 framework/CHANGELOG.md | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/framework/BaseYii.php b/framework/BaseYii.php
index 2aa46698c8..ef0bef9395 100644
--- a/framework/BaseYii.php
+++ b/framework/BaseYii.php
@@ -93,7 +93,7 @@ class BaseYii
      */
     public static function getVersion()
     {
-        return '2.0.18-dev';
+        return '2.0.18';
     }
 
     /**
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 1106c4b5b7..50e266445c 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -1,15 +1,16 @@
 Yii Framework 2 Change Log
 ==========================
 
-2.0.18 under development
-------------------------
+2.0.18 April 23, 2019
+---------------------
 
+- Bug #16589: Fixed not using `defaultValue` in `BlameableBehavior` for console app (evil1)
+- Bug #16820: `yii\filters\Cors::prepareHeaders()` now accepts Access-Control-Allow-Headers in preflight response (georgezim85)
 - Bug #17220: Fixed error when using non-InputWidget in active form field (s1lver)
 - Bug #17235: `yii\helpers\FileHelper::normalizePath()` now accepts stream wrappers (razvanphp)
-- Bug #16820: `yii\filters\Cors::prepareHeaders()` now accepts Access-Control-Allow-Headers in preflight response (georgezim85)
-- Bug #16589: Fixed not using `defaultValue` in `BlameableBehavior` for console app (evil1)
 - Bug #17268: Fixed Formatter didn't take power into account (samdark)
 
+
 2.0.17 March 22, 2019
 ---------------------