4 commits

Author	SHA1	Message	Date
Micah Jerome Ellison	f12cc08668	Merge branch 'upstream_develop' into delete-all-932	2020-05-02 15:21:34 -07:00
Micah Jerome Ellison	1c2432ba08	Prevent filtered deletion from deleting entire journal #932 and add lots of deletion tests	2020-05-02 15:16:32 -07:00
Jonathan Wren	4b58577f1d	Disable --delete due to critical bug (#934)	2020-05-02 13:17:06 -07:00
dbxnr	15429d4f61	Interactive delete (#850) ... * fixup alichtman's implementation * cleanup imports Co-authored-by: Aaron Lichtman <aaronlichtman@gmail.com> Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>	2020-04-10 16:18:34 -07:00