From d363fa02c6d51efa2ca07fd052cbec0377703293 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Thu, 21 Jun 2018 11:50:09 -0400
Subject: [PATCH] Prepare for version 4.8.2

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 ChangeLog                    | 2 +-
 README                       | 2 +-
 doc/conf.py                  | 2 +-
 libraries/classes/Config.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3ffb7f9da57f..65cc9cf577b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.8.2 (not yet released)
+4.8.2 (2018-06-21)
 - issue #14370 WHERE 0 causes Fatal error
 - issue #14225 Fix missing index icon
 - issue        [security] XSS vulnerability in Designer, see PMASA-2018-3
diff --git a/README b/README
index 95de1650397f..614f90c8c0e4 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.8.2-dev
+Version 4.8.2
 
 A web interface for MySQL and MariaDB.
 
diff --git a/doc/conf.py b/doc/conf.py
index 1e302f438602..09b174002766 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -51,7 +51,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.8.2-dev'
+version = '4.8.2'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index 6faccb1b7719..0c8d6642b0a6 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -116,7 +116,7 @@ public function __construct($source = null)
      */
     public function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.8.2-dev');
+        $this->set('PMA_VERSION', '4.8.2');
         /* Major version */
         $this->set(
             'PMA_MAJOR_VERSION',