Veronica K. B. Olsen 717e4aba78 Fix merge conflicts

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

..

assets

Fix merge conflicts

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

constants

Added functions to read and write project lockfile

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

convert

Fixed hard line breaks in markdown export

2019-11-18 20:15:29 +01:00

gui

Fix merge conflicts

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

project

Fix merge conflicts

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

tools

Fix merge conflicts

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

__init__.py

Fix tests and added --data option to command line

2020-02-26 18:27:07 +01:00

common.py

Project manager dialog now lists recent projects and lets the user open one of these, or browse for a folder

2020-02-26 17:44:11 +01:00

config.py

Added functions to read and write project lockfile

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

guimain.py

Fix merge conflicts

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