Merge branch 'master-wm' into 2.0-wm

This commit is contained in:
MinchinWeb 2018-04-07 19:56:48 -06:00
commit b3e614f441
26 changed files with 313 additions and 79 deletions

View file

@ -0,0 +1,16 @@
{
"default_hour": 9,
"timeformat": "%Y-%m-%d %H:%M",
"linewrap": 80,
"encrypt": false,
"editor": "",
"default_minute": 0,
"highlight": true,
"password": "",
"journals": {
"simple": "features/journals/simple.journal",
"work": "features/journals/work.journal",
"ideas": "features/journals/nothing.journal"
},
"tagsymbols": "@"
}