summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJrnl Bot <jrnl.bot@gmail.com>2020-04-11 22:08:01 +0000
committerJrnl Bot <jrnl.bot@gmail.com>2020-04-18 12:35:46 -0700
commit62ea1e2b23992281c301d58b5270b987ce799580 (patch)
tree33149ff4aa3051a6aa7793ec1752bebff392793c
parenta03445bb843dd71302f38c0b707592a8071e8be2 (diff)
Updating changelog [ci skip]
-rw-r--r--CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 508c6afc..ad4d4ea5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,13 +7,13 @@
**Implemented enhancements:**
- Update keyring version from "^19.0" to "\>19.0, \<22.0" [\#914](https://github.com/jrnl-org/jrnl/pull/914) ([micahellison](https://github.com/micahellison))
-- Merge in temp branches for v2.4 [\#897](https://github.com/jrnl-org/jrnl/pull/897) ([wren](https://github.com/wren))
+- Allow tzlocal version \>1.5 \<3.0 instead of \>1.5 \<2.0 [\#900](https://github.com/jrnl-org/jrnl/pull/900) ([micahellison](https://github.com/micahellison))
+- TODO: Update after release to reference PRs \#850 and \#796 [\#897](https://github.com/jrnl-org/jrnl/pull/897) ([wren](https://github.com/wren))
**Fixed bugs:**
- Fix Python 3.9 incompatibility by updating plistlib [\#909](https://github.com/jrnl-org/jrnl/pull/909) ([MinchinWeb](https://github.com/MinchinWeb))
- Fix typo in YAML exporter \("stared" -\> "starred"\) [\#907](https://github.com/jrnl-org/jrnl/pull/907) ([MinchinWeb](https://github.com/MinchinWeb))
-- Syntax fix [\#886](https://github.com/jrnl-org/jrnl/pull/886) ([MinchinWeb](https://github.com/MinchinWeb))
**Build:**