diff --git a/CHANGELOG.md b/CHANGELOG.md index 073db1ef6e..8a9f22988c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html); however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319). If you're a plugin developer, note the "BREAKING" section. -# v3.10.0-dev3 +# v3.10.0-dev4 ## Added @@ -20,6 +20,7 @@ however, insignificant breaking changes do not guarantee a major version bump, s - Certain situations where the internal thread cache breaks and spams new channels. ([GH #3022](https://github.com/kyb3r/modmail/issues/3022), [PR #3028](https://github.com/kyb3r/modmail/pull/3028)) - Blocked users are now no longer allowed to use `?contact` and react to contact. ([COMMENT #819004157](https://github.com/kyb3r/modmail/issues/2969#issuecomment-819004157), [PR #3027](https://github.com/kyb3r/modmail/pull/3027)) +- UnicodeEncodeError will no longer be raised on Windows. ([PR #3043](https://github.com/kyb3r/modmail/pull/3043)) # v3.9.5 diff --git a/README.md b/README.md index 19931575c9..bd9d0b8f69 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ <<<<<<< HEAD - + ======= >>>>>>> master diff --git a/bot.py b/bot.py index 4c235dedad..837fe304cd 100644 --- a/bot.py +++ b/bot.py @@ -1,5 +1,5 @@ <<<<<<< HEAD -__version__ = "v3.10.0-dev3" +__version__ = "v3.10.0-dev4" ======= __version__ = "3.9.5" >>>>>>> master diff --git a/pyproject.toml b/pyproject.toml index 4bc1a22707..556c7b277c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ extend-exclude = ''' <<<<<<< HEAD [tool.poetry] name = 'Modmail' -version = '3.10.0-dev3' +version = '3.10.0-dev4' description = "Modmail is similar to Reddit's Modmail, both in functionality and purpose. It serves as a shared inbox for server staff to communicate with their users in a seamless way." license = 'AGPL-3.0-only' authors = [