Merge branch 'master' of github.com:preservim/nerdtree - nerdtree

commit d48ab70721d4f688ed34bd5939e2d6f4c89548c5
parent 635071dcc883f1da9034b4a011419e559620d377
Author: Phil Runninger <philrunninger@gmail.com>
Date:   Mon,  1 Jun 2020 02:09:39 -0400

Merge branch 'master' of github.com:preservim/nerdtree

Diffstat:
M CHANGELOG.md  | 2 ++

1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
      version in an unordered list.  The format is:
         - **.PATCH**: Pull Request Title (PR Author) [PR Number](Link to PR)
 -->
+#### 6.8
+- **.0**: Allow concealed characters to show another character. (PhilRunninger) [#1138](https://github.com/preservim/nerdtree/pull/1138)
 #### 6.7
 - **.15**: Add curly braces to the list of characters to be escaped. (PhilRunninger) [#1128](https://github.com/preservim/nerdtree/pull/1128)
 - **.14**: Use backward-compatible `nerdtree#and()` in one place that was missed. (PhilRunninger) [#1134](https://github.com/preservim/nerdtree/pull/1134)