From df0f2121a4e70104fd2663b0c59709f4ad5e5f75 Mon Sep 17 00:00:00 2001
From: Lucas Bartholemy <lucas@bartholemy.com>
Date: Mon, 14 May 2018 16:41:17 +0200
Subject: [PATCH] Prepare 1.2.6 release

---
 protected/humhub/config/common.php | 2 +-
 protected/humhub/docs/CHANGELOG.md | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/protected/humhub/config/common.php b/protected/humhub/config/common.php
index a89f44629f..98507f32ff 100644
--- a/protected/humhub/config/common.php
+++ b/protected/humhub/config/common.php
@@ -12,7 +12,7 @@ Yii::setAlias('@config', '@app/config');
 
 $config = [
     'name' => 'HumHub',
-    'version' => '1.2.5',
+    'version' => '1.2.6',
     'basePath' => dirname(__DIR__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR,
     'bootstrap' => ['log', 'humhub\components\bootstrap\ModuleAutoLoader', 'queue'],
     'sourceLanguage' => 'en',
diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
index 4d528f63b2..eaf5ad39c7 100644
--- a/protected/humhub/docs/CHANGELOG.md
+++ b/protected/humhub/docs/CHANGELOG.md
@@ -1,14 +1,19 @@
 HumHub Change Log
 =================
 
-1.2.6  (Unreleased)
+1.2.6  (May 14, 2018)
 -----------------------
 
+When you are using a custom theme, you may need to add the newly introduced footer navigation to your overwritten view files.
+You can find a full list of the view changes here: https://github.com/humhub/humhub/commit/a1815fb61d83619ce9ca40166800b8c5dcb9d539
+
 - Fix #3108: Fixed cronjob examples with leading zero (acs-ferreira)
 - Fix: Memory leak in activity mail summary processor cron
 - Fix: With enabled guest mode BaseAccountController does not redirect to login page
 - Enh: Added footer navigation - FooterMenu widget
 - Enh: Added HForm class events EVENT_AFTER_INIT and EVENT_BEFORE_RENDER
+- Enh: Updated translations
+
 
 1.2.5  (April 11, 2018)
 -----------------------