Jonathan Wren 44cafe6c16 Merge branch 'develop' into encryption-rework ... Conflicts: jrnl/output.py		2022-10-01 12:45:32 -07:00
..
bdd	Add machine readable --list output (#1592)	2022-09-24 12:46:49 -07:00
data	Add linewrap option 'auto' (#1507)	2022-07-30 12:22:04 -07:00
lib	Merge branch 'develop' into encryption-rework	2022-10-01 12:45:32 -07:00
unit	Clean up copyright notices and version screen (#1553)	2022-08-21 14:17:35 -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