Jonathan Wren dcdee69117 Merge branch 'develop' into encryption-rework ... Conflicts: jrnl/output.py jrnl/prompt.py		2022-11-05 15:53:04 -07:00
..
bdd	Add double encryption test (#1626)	2022-10-30 13:06:54 -07:00
data	Fix bug for new --list --format options when no default journal is specified (#1621)	2022-10-22 15:35:16 -07:00
lib	Merge branch 'develop' into encryption-rework	2022-10-08 16:00:19 -07:00
unit	Don't create empty file when attempting a YAML export to a non-existing folder (#1600)	2022-10-08 13:48:29 -07:00
__init__.py	Implement Tox for testing (#1504)	2022-06-18 11:54:28 -07:00
conftest.py	Clean up copyright notices and version screen (#1553)	2022-08-21 14:17:35 -07:00