Merge branch 'master' into exit-after-no-text-entry

This commit is contained in:
Aaron Lichtman 2019-11-15 09:34:50 +01:00 committed by GitHub
commit ac21a4facb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 546 additions and 530 deletions

View file

@ -0,0 +1,12 @@
default_hour: 9
default_minute: 0
editor: ""
encrypt: false
highlight: true
journals:
default: features/journals/little_endian_dates.journal
linewrap: 80
tagsymbols: "@"
template: false
timeformat: "%d.%m.%Y %H:%M"
indent_character: "|"

View file

@ -0,0 +1,11 @@
{
"default_hour": 9,
"timeformat": "%d.%m.%Y %H:%M",
"linewrap": 80,
"encrypt": false,
"editor": "",
"default_minute": 0,
"highlight": true,
"journals": {"default": "features/journals/simple_jrnl-1-9-5_little_endian_dates.journal"},
"tagsymbols": "@"
}