Veronica K. B. Olsen 717e4aba78 Fix merge conflicts

2020-02-27 00:19:18 +01:00

..

__init__.py

Reorganise constants, and add ISO language codes in order to drop dependency pycountry

2019-11-05 18:14:40 +01:00

backup.py

Backup tool should not back up the lock file

2020-02-26 22:18:34 +01:00

document.py

Make document saving consistent with how project file is saved

2020-02-13 19:16:29 +01:00

index.py

Allow tags in files with no title

2019-12-10 19:05:57 +01:00

item.py

Cleanup of imports

2020-02-17 13:30:26 +01:00

project.py

Added functions to read and write project lockfile

2020-02-26 22:09:37 +01:00

status.py

Fixed crash in project countStatus when tree contains orphaned item

2019-11-18 19:51:31 +01:00