Merge branch 'develop' into mode-actions-1639

Conflicts:
  jrnl/controller.py
This commit is contained in:
Jonathan Wren 2023-03-25 11:56:57 -07:00
commit 15a5b143ee
12 changed files with 1558 additions and 1400 deletions

View file

@ -42,6 +42,7 @@ def expected_args(**kwargs):
"strict": False,
"tagged": False,
"tags": False,
"template": None,
"text": [],
"config_override": [],
"config_file_path": "",