Merge branch 'upstream_develop' into config-dir-659

This commit is contained in:
Micah Jerome Ellison 2020-12-26 12:09:02 -08:00
commit 8fd545ac9f
77 changed files with 1555 additions and 1201 deletions

View file

@ -1,3 +1,6 @@
# Copyright (C) 2012-2021 jrnl contributors
# License: https://www.gnu.org/licenses/gpl-3.0.html
import ast
from collections import defaultdict
import os