From 6d953a08bd0ad06031205121fef2b54f1a72c52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Ko=CC=88nemann?= <office@holgerkoenemann.de>
Date: Wed, 29 Nov 2017 10:24:45 +0100
Subject: [PATCH] preparing 0.6.9 update part 2

---
 CHANGELOG.md   | 15 +++++++++++++++
 inc/editor.php |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3a11df..f21307a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+            - ** Release 0.6.9 November 28th 2017 **
+              - Basic guideline adjustments
+              - Update prefixes
+              - Remove automatically db updates by theme
+              - Rename and streamline functions
+              - Changing WooCommerce text domain to "understrap"
+              - Disable theme-settings.php call
+              - Remove jQuery 3.2.1 slim and switch back to WP core jQuery version
+              - Update Bootstrap 4 Beta 2 to commit which fixes jQuery conflict
+
+
+            - ** Release 0.6.8 November 27th 2017 **
+              - Theme check updates
+              - Bugfix release            
+
             - ** Release 0.6.7 November 24th 2017 **
               - Workaround for jQuery inconsistency problem between Bootstrap Beta 2 and WordPress in noConflict mode
               - Adding jQuery slim 3.2.1
diff --git a/inc/editor.php b/inc/editor.php
index 1672cae..4949a43 100644
--- a/inc/editor.php
+++ b/inc/editor.php
@@ -11,7 +11,7 @@
 function understrap_wpdocs_theme_add_editor_styles() {
   add_editor_style( 'css/custom-editor-style.css' );
 }
-add_action( 'admin_init', 'wpdocs_theme_add_editor_styles' );
+add_action( 'admin_init', 'understrap_wpdocs_theme_add_editor_styles' );
 
 // Add TinyMCE style formats.
 add_filter( 'mce_buttons_2', 'understrap_tiny_mce_style_formats' );