diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a22ae2..89d6458 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,16 @@ # Change Log -## 1.3.16-pre +## [1.3.16](https://github.com/cmderdev/cmder/tree/v1.3.16) (2020-07-29) -* fix vscode terminal errors when setting cmder fast_init=1 outside cmder [#2339](https://github.com/cmderdev/cmder/pull/2339) +### Fixes +* Merge pull request #2357 from FloSchwalm/fix-git-version-comparison [Dax T Games] +* Merge pull request #2339 from daxgames/fix_global_vars_vscode_err [Dax T Games] + +### Changes + +* Merge pull request #2358 from FloSchwalm/update-to-git-2.28 [Dax T Games] + ## [1.3.15](https://github.com/cmderdev/cmder/tree/v1.3.15) (2020-06-26) * Fixes #2247, fixes #2254 [#2265](https://github.com/cmderdev/cmder/pull/2265) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 816d1e4..1727944 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ If you follow them your contribution will likely be pulled in quicker. ## Getting Started * Fork the repository on GitHub (It's that easy) -* Create a feature branch based on the development branch. +* Create a feature branch based on the `master` branch. ## Making Changes